On Friday, December 5, 2014 9:13:12 AM UTC, Simon King wrote: > > would result in resolving the same conflicts twice. Certainly there is a > better way!?! >
Don't merge branches unless you have to. The easiest solution is just to not merge A' into B Also, commits are immutable: Merging A' into B means: make a new branch head B'. It doesn't change B nor anything in the history of C. The feature you are asking for is git rerere "reuse recorded resolution", http://git-scm.com/blog/2010/03/08/rerere.html -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
