Re: Suggestion to enable git rerere by default

[Artur Malabarba]

Nicolas Richard <address@hidden> writes:

> Aurélien Aptel <address@hidden> writes:
>> made any subsequent master merge a lot harder, sorry for that. The
>> weird thing is most conflicting changes where actually identical but
>> git couldn't tell. The diff were the same on both side but git couldnt
>> tell they were from the same commits since they were squashed.
>
> ...did you enable git rerere ? (you can check with: git config --get
> rerere.enabled). If not, I suggest that you do it:
>     git config --global rerere.enabled 1

I had never heard about it. If it's really as nice as it sounds (no
drawbacks?), lets add this recommendation.

> modified   admin/notes/git-workflow
> @@ -124,6 +124,11 @@ the resulting merge, but if you really want to, feel 
> free to do that.
>  Note you can also resume gitmerge in a new Emacs session, since the
>  current state will be saved to disk.
>  
> +The following is helpful if you're going to merge the same set of
> +changes multiple times :

This sounds strange to me. Would it be better to say: “if you're going
to merge master onto the same (long-lived) feature branch multiple
times”?