Should work. Perhaps one of the edits in C conflicted with the resolution? You can also try different conflict resolution strategies (man git-merge)
On Friday, December 5, 2014 11:50:40 AM UTC, Simon King wrote: > > Hi Volker, > > On 2014-12-05, Volker Braun <[email protected] <javascript:>> wrote: > > On Friday, December 5, 2014 11:16:34 AM UTC, Simon King wrote: > >> > >> Moreover, there are merge conflicts. Hence, they *have* to be > >> resolved at some point. > >> > > > > Yes, but they only need to be resolved once if you wait. Eventually > there > > will be a conflict with the develop branch that you need to resolve. But > if > > all merges are with the develop branch then all future merges see the > > resolution in their history, so you don't have to re-do them. > > Is that special to the develop branch? After all, when I merge A' into B > (resulting in B') and then merge B' into C, then the history of B' does > contain the resolution, isn't it? That's exactly why I am surprised of > the fact that I need to recreate the resolution when merging B' into C. > > Best regards, > Simon > > > -- 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 [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
