I've read the somewhat sparse documentation in gitattributes(5) on
the "union" merge driver, but on #git I was cautioned that there may
be unexpected behaviors. My use-case is to consolidate (usually[*])
append-only mbox files that might "conflict" when different messages
are added within various checkouts; the resolution being "keep both
Are there other places/sites I can learn more about "union"? My
google-fu hasn't found any further information and I was wondering
what I should be watching for.
Yes, in theory, messages should be deletable from the mbox, but
that's an edge case I'm willing to hand-tweak if needed. And in all
likelyhood, git does would do the right thing anyways.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at