"Neal Kreitzinger" <neal@xxxxxxxx> writes:
> Does anyone know if there are configuration and/or command-line options in
> git that can accomplish this in a fairly straightforward manner?
I know there isn't.
Essentially what you are asking for is
read-tree -m -u --trivial O A B
followed by no file-level automerge. I think you can write a custom merge
strategy, perhaps using "resolve" as a template, to do that.
In practice, you will get too many false "conflicts" with such a strategy
and the quality of your "review" would degrade from fatigue, I suspect.
--
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