https://developer.android.com/
http://www.jetbrains.com/
Saturday, November 15, 2014
Reducing merge headaches: git meets diff3
Miscellaneous git topics
------------------------------------
git meets diff3 is a great explanation for a superior diff format.
diff3 is important since you frequently need the ancestor to determine what the correct merge is. Why diff3 is not the default makes no sense to me.
Additionally, rerere (reuse recorded resolution)
gives an automated mode for resolving conflicts.
------------------------------------
git meets diff3 is a great explanation for a superior diff format.
diff3 is important since you frequently need the ancestor to determine what the correct merge is. Why diff3 is not the default makes no sense to me.
Additionally, rerere (reuse recorded resolution)
gives an automated mode for resolving conflicts.
$ git config --global rerere.enabled 1
11-15-2014
Sacha Chua is a strong Emacs evangelist.
Her five year experiment in consulting sounds courageously fascinatinating.
Sacha Chua is a strong Emacs evangelist.
Her five year experiment in consulting sounds courageously fascinatinating.
Subscribe to:
Posts (Atom)