Hi Michael, thanks for your help, I would give up otherwise, but now I managed to get this working with a special git merge script that automatically performs merge from A to B and vice versa by ignoring (with git merge -s ours) all opposite commits created by automated merge script (by itself),
Also with "git merge -s ours" we can select which parts of the history we want to carry forward and which parts not. After performing single merge with -s ours for certain part of the history git will no longer complain about that in future merges (even normal merges) as it has already marked it as merged. regards, Matevz -- 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.
