I am attempting to merge a feature branch to the master branch. How I plan to do it is to create a branch of the current master (we can call it temp branch), and merge the release branch to the temp branch, then pull request and merge that temp branch to the master branch. So this is how I did it:
git checkout master
git pull origin
git checkout -b feature/temp
git pull origin release/<release-branch-name-here>
It is here that I get almost 1000 merge conflicts, most of them saying that the merged file does not exist on my temp branch. Any ideas on how to fix it? I don't want to go around trying to resolve 1000 or so missing files.