Take the 2-minute tour ×  I understand that the "ours" merge
strategy (hear the quotes around merge?) actually does not use
any commits from the other branch.  The "ours" strategy is
sometimes mentioned as "keeping the other's history". But it
records that history as "applied". Weird. Are there cases where
I do want this behaviour?  As an alternative, you could just as
well import the other branch and let its history there, where it
belongs.  Note that I am asking about the "-s ours" strategy,
not the "-X ours" option to "-s recursive" (which is different
in that it applies those commits that don't conflict).
share|improve this question add comment  2 Answers  up vote 5
down vote accepted  One use is to "skip" a commit made on a
maintenance branch that isn't intended to go back into your
main/trunk branch of development. See this previous question for
an example: git - skipping specific commits when merging
share|improve this answer add comment  I'm using this pseudo-
merge in an additional branch used to tr