In larger teams you can assign merging and conflict resolution to specialists. For example, Linus Torvalds does pretty much exactly this special role (merging stuff from separate departments) all day long and git is excellent at this.

The interesting question is, how much can you automate? Git is the "very little" department, because Linus prefers a deterministic and simple process to an easy, but less reliable one.