Kacper Kornet <drae...@pld-linux.org> writes: >> Is there any interaction between this "pull --reverse-parents" >> change and possible conflict resolution when the command stops and >> asks the user for help? For example, whom should "--ours" and "-X >> ours" refer to? Us, or the upstream? > > The change of order of parents happens at the very last moment, so > "ours" in merge options is local version and "theirs" upstream.
That may be something that wants to go to the proposed commit log message. I am neutral on the "feature" (i.e. not against it but not extremely enthusiastic about it either). Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
