Skip to content
On this page



How do I resolve a git merge conflict in favor of pulled changes?

Basically I need to remove all conflicting changes from a working tree without having to go through all of the conflicts with a git mergetool while keeping all conflict-free changes. Preferably doing this while pulling, not afterwards.


git pull -s recursive -X theirs origin develop_next

Made with ❤️ by Xin