Hi Matevz, On Wednesday, May 17, 2017 at 6:15:49 PM UTC+2, matevz...@borea.si wrote: > > I managed on simple repository with > merge -s ours > To ignore specific commits from the other side. > > However in real life repo things get broken pretty soon. A changes are > propagated to B and then back to A and are lost in A, but remain in B :-) >
This is exactly what I referred to as "while possible to accomplish, may be rather confusing and greatly complicate our life down the road" in my initial reply[1]... :) [1] https://groups.google.com/d/msg/git-users/ovqx55Fv6bY/vuirLMmXAgAJ -- 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.
