> > ... and (2) either way, you end up with with branchA state being the same > (whichever of the two paths you take). >
p.s. Just to clarify "branchA state being the same" - once you eventually do that 'git merge branchB' in the future, that is, no matter if you`re merging from z directly, or from redone/resolved merge commit (being the same as z). -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
