today-i-learnt

Resolve git merge conflicts with their changes

Category	git
Added on	2026-03-17
Source	source

$ git pull -X theirs

If already in conflicted state:

$ git checkout --theirs path/to/file