On 11/05/2013 10:09 AM, Simon King wrote: >> To achieve this from the above situation, you do >> >> git rebase --onto ticket/123 master ticket/456 > > Good to know! I did not test yet. Is there any manual intervention > needed, if X is disjoint from the changes introduced in B?
No. A merge conflict can only happen, if X builds (depends) on changes that are introduced in B, since these changes would not be there in the A-C branch. Ralf -- 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/groups/opt_out.
