The -X theirs strategy option makes merge conflicts resolve automatically to the incoming branch's version, while -X ours prefers the current branch. It removes the manual conflict step but can silently drop the losing side's changes. Reserve it for well-understood merges.
Looking for more? Search all 7,657 commands — works offline, in English or Spanish, and fixes typos.