Hi, On Sun, 15 Nov 2009, Thomas Rast wrote: > Using the "ours" strategy with rebase just discards all changes, turning > <branch> into <upstream> (or <newbase> if given). This is unlikely to > be what the user wants, so simply refuse to do it. "Unlikely" or "impossible"? Besides, I find it rather arbitrary that the "ours" strategy is refused, but none of the user-provided merge strategies. IOW disallowing "ours" may very well foster unreasonable expectations. Ciao, Dscho -- 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