Resolve conflict in a Pull Request

To do this, you would create a branch off the tip of master, pull in the release branch and create a pull request from that branch to master. This is the best option if you don’t have permission to push directly to master.

git checkout master
git checkout -b resolve-conflicts-branch
git pull origin release/2

<resolve merge conflicts and commit>

git push -u origin resolve-conflicts-branch

<create pull request>

Note: Once you have resolve the conflicts through either of these methods, your old pull request from release/2 to master will be closed automatically since there will no longer be any diff.