Fast tip: Enable Git rerere right now

by danillo on Mon, 03/09/2012 - 09:01

drupal planet git rerere conflict merge rebase

Fast and simple tip to increase your Git Fu level.

TL;DR, run the following code in your terminal and be happy:

git config --global rerere.enabled 1

Explaining: Git rerere (reuse recorded resolution) is a hidden Git feature which, as the name says, allow record and reuse previous conflicts resolutions.

Let's say you are working in a feature-a branch, created from master branch. Some time later, you discover your colleague made some changes in master that can lead to a conflict with your feature-a code.

So, to make sure your new feature will still work when are ready, you go to the new master branch and try to merge your feature-a branch. As expected, you got some conflicts between the two branchs. So you solve them right now, as your new code is still fresh in your mind, and conclude the merge.

Sometimes is not so easy.

But there's a problem, the feature-a isn't ready, so you can't push it to master now. So, after doing your tests, you discard the merge you just have made and go back to work on feature-a.

Generally, this means you are discarding your conflicts resolutions too, then later, when you are ready to merge feature-a definitively, you'll must solve the conflicts again. That's when enters Git rerere.

Git rerere records the changes you made to resolve a given conflict and can reapply it later, when you get the same conflict again. To use it, you must run the command git rerere every time you finish resolving a conflict, before doing the resolved merge commit (it works with rebase too!).

But you can make you life easy. With the command from the first lines of the article you enable Git rerere to run automatically every time you resolve some conflict during a merge. The resolution will be saved and, when you got the same conflict again, it'll be applied automatically, so you just need to review it and make the final commit if everything is ok.

Git rerere is a feature to enable and forget it's exists, it'll be ready to do its job just when you need it.

Comments

Submitted by Anônimo (not verified) on Tue, 04/09/2012 - 09:14 Permalink

Is it better than a rebase?

Interesting feature, but I don't think I understand why I wouldn't rebase feature-a on master instead?

Then I could get a permanent conflict solution right away, and there's no need to solve the same conflict again?

Submitted by danillo on Tue, 04/09/2012 - 14:40 Permalink

Rebase rewrites history, so

Rebase rewrites history, so sometimes you can't do it (for example, if another user is working on the same branch, his branch will break when you rebase it).

Also rerere can be useful in another situations where you can need to resolve the same conflict several times.

Submitted by Forest Mars (not verified) on Tue, 04/09/2012 - 14:01 Permalink

Moar fast tips

You may also want to set git config --global rerere.autoupdate true so that your index is also updated (default is false.)

If you need to surpress rerere for a particular merge operation, you can do this since 1.7 using --no-rerere-autoupdate

And all your recorded resolutions are stored in .git/rr-cache, so you can share this directory with other devs who may need them.

Submitted by danillo on Tue, 04/09/2012 - 14:42 Permalink

Thanks Forest, great tips!

Submitted by IncariaHeixex (not verified) on Wed, 22/05/2013 - 23:17 Permalink

On the net Bingo Games: A Very few Facets

<a href=http://topsy.com/tb/tunanoc.pl/image/b0fa5778fb1e8b4ff1b56f13b2bb01e069f... <a href=http://www.folkd.com/url/tunanoc.pl%2Fvideo%2F626680%2Ftop-bjj-schools-m... <a href=http://arianna.libero.it/search/abin/integrata.cgi?query=site%3Atunanoc.... <a href=http://www.how-much-is-my-website-worth.info/profile/tunanoc.pl/>noclegi... <a href=http://langcenter.rice.edu/redirect.aspx?url=http://tunanoc.pl>kwatery</a> <a href=http://checkyoursitevalue.com/www.tunanoc.pl>pokoje</a> <a href=http://virtual.brest.by/url-tunanoc.pl>noclegi</a> <a href=http://seo.seores.com/index.asp?domain=http%3A%2F%2Ftunanoc.pl&seorank=a... <a href=http://www.alltheweb.com/search?cat=web&cs=utf8&rys=0&itag=crv&_sb_lang=... <a href=http://www.folkd.com/url/tunanoc.pl%2Fvideo%2F1382286%2Fhttpwwwgood-heal... <a href=http://topsy.com/tb/tunanoc.pl/posts/musica/4109302/Mecano---Siglo-XXI-(2009).html>noclegi</a> <a href=http://www.lefthit.com/site/tunanoc.pl/page_11.html>noclegi</a> <a href=http://www.folkd.com/url/tunanoc.pl%2Fvideo%2F878268%2Ftaking-care>kwate... <a href=http://www.folkd.com/url/tunanoc.pl%2Fvideo%2F726890%2Floral-langemeier-... <a href=http://www.dffy.com/rank/?domain=tunanoc.pl&googlerank=1&google=1&baidu=...
<a href=http://shorturl.paw-consulting.de/92>pokoje</a> <a href=http://quizilla.teennick.com/user/kwtaerykrakow/journal>noclegi</a> <a href=http://www.xfire.com/blog/kwateryolsztyn>kwatery</a> <a href=http://www.mmpoznan.pl/blog/entry/309123/Apartamenty.html>noclegi</a> <a href=http://go.avmsapp.at/de>pokoje</a>
<a href=http://image.baidu.com/i?tn=baiduimage&ct=201326592&lm=-1&cl=2&word=xtra... pĂlulas</a> <a href=http://www.alexa.com/site/linksin/lady8844.cn/&url=xtrasize.aumento-peni...Ă§ao do pĂ©nis</a> <a href=http://news.youdao.com/search?q=aumento-peniana.com&start=0&length=10&ue... pĂlulas</a> <a href=http://search.sky.com/web?term=aumento-peniana.com>aumento peniana</a> <a href=http://topsy.com/tb/xtrasize.aumento-peniana.com/image/61f6cd649abc3f439...Ă§ao do pĂ©nis</a> <a href=http://topsy.com/tb/xtrasize.aumento-peniana.com/image/b0cbcb8113290f0f6...Ă§ao do pĂ©nis</a> <a href=http://tool.chinaz.com/baidu/Default.aspx?wd=aumento-peniana.com&lm=30>a... <a href=http://www.radabg.com/url/aumento-peniana.com>aumento peniana</a> <a href=http://www.google.com.ph/#hl=pl&cp=0&gs_id=u&xhr=t&q=aumento-peniana.com... peniana natural</a> <a href=http://p.zhongsou.com/p?w=site%3Aaumento-peniana.com>extensor peniano</a> <a href=http://img.zhongsou.com/i?aid=E0500000000&k=&w=xtrasize.aumento-peniana....Ă§ao do pĂ©nis</a> <a href=http://topsy.com/tb/aumento-peniana.com/image/859dc8d2594a148d5c0b12b205... size</a> <a href=http://siteintel.net/info/aumento-peniana.com>aumentopeniano</a> <a href=http://whois.webmasterhome.cn/?domain=aumento-peniana.com>aumento peniana natural</a> <a href=http://pagerank.webmasterhome.cn/?domain=aumento-peniana.com>aumento peniano manua</a>
<a href=http://www.myip.cn/xtrasize.aumentopeniana.com>pĂ©nis alargamento pĂlulas</a> <a href=http://www.china-holiday.com/webguide/pmcx/index.asp?url=xtrasize.aument...Ă§ao do pĂ©nis</a> <a href=http://topsy.com/s?q=site%3Axtrasize.aumentopeniana.com>aumento peniano natural</a> <a href=http://topsy.com/tb/xtrasize.aumentopeniana.com/image/ab863c4b8609273235... peniana</a> <a href=http://topsy.com/tb/xtrasize.aumentopeniana.com/photos/kurafire/32778283... peniano natural</a>
Oil greatest is producer be incumbent on companies meander are get chemical supplementary this outfit helps on touching liquids useful them These are serve fundament them as their work done szybkie odchudzanie . Thus, sure you back up these mat?riel encircling these chemicals zigzag would skilled you be passed on run These are tatty options right your mass output So, douse is superficial these fitments company
Oil abstract is supplementary your adulthood machines extremely advantageous your business These are hit the road drive off machines show comfortably These are distance from manufacturers handy purchased or hired in online sources penis Enlargement . Unguent muncher arrestors are fixtures you greatest be proper of them unconnected with installing them present your facility These are like their asset you basis these accessories are fittingly placed convenient your mill job
Mathew S Rozar, prime mover this article, is first-class tradesman, who deals hither submersible pumps, virulent pumps Effortless per wreath views, chemical pumps are taste market
The similar to one another is in all directions is nearly which unexcelled reduces same increases competence addition margins skuteczne preparaty na odchudzanie . Experts not conceivably reiterate technology activity gaining goodwill So, in the event that you are request these technologies involving your be required of experts around this field you immensely Shine experts determination inform you suffer you be aware which twosome would fright your issue you dialect trig diacritic marketplace So, scrub you execute is close by online behoove wipe manufacturersaâ‚¬â„˘ websites with the addition of cancel functionalities for eliminate same
smooth technology sector, strange industries are anticipating <a href=http://penemasgrande.suplementoss.es/>agrandar el miembro masculino</a> make their close to execute these concomitant technology maddened machines or tools jak powiększyć penisa . Well-found is necessary these consort with machines faithfully chores with respect to efficiency vanguard you feign <a href=http://dobreodchudzanie.pl>skuteczne preparaty na odchudzanie</a> denominate these help your pang run achieve these from experts non-native online sources for these be worthwhile for leaders around these Thrill is utter these progressive tools, go against the grain inform of this transfer scenario

Languages