"Dmitry S. Kravtsov" <idkravitz@xxxxxxxxx> writes: > and from git-rebase man page I read, that strategy ours allows us to > discard conflicing changes in favor > of ours. That is not what the "ours" strategy is about. When merging another history into our history, the strategy marks the other history "merged" while using our tree as the result of the merge, without using _anything_ from their history. It is not a way to take whatever that happen to merge cleanly textually but use our change in only the conflicting parts. You are probably confusing it with 'ours' option of the recursive strategy, that is used in "git merge -Xours". -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html