There's no way to merge without resolving conflicts. Otherwise, how would git know what to merge? You can, however, check out the version from either branch you're merging using git checkout --ours <filepath> or git checkout --theirs <filepath>. Here's an example:
Suppose you're on the master branch merging in staging:
git checkout master
git merge staging
And git shows a bunch of conflicts:
...
CONFLICT: Readme.md
...
If you want to keep the version of Readme.md which is on the master branch, then you would need to run the following command:
git checkout -- ours Readme.md
Note that since you're on master --ours refers to the master branch.
Now, you can simply add it to the index to mark it as resolved:
git add Readme.md
This will effectively ignore any changes made to Readme.md file on the staging branch.
You can repeat this process for each file you want to remove from the merge. When you're done, commit as you normally would:
git commit -m "some_msg"
In order to repeat it for all files with conflicts you can try the following:
for f in $(git diff --name-only --diff-filter=U | cat); do
echo "Resolve conflict in $f ..."
git checkout --theirs $f
done
Back