I want to pull a project and resolve merge conflicts using my changes. How can I do this?
Use the recursive merge strategy with the ours option:
git merge -s recursive -X ours branch_to_merge
or
git pull -s recursive -X ours
For any conflicts, it will use the hunk that comes from your branch. See the git merge man page for more details.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With