Help in Pull Request promote wrong solution to merge with conflicts

If pull request can't be merged, Stash show instructions how to solve this and this instructions are wrong:

Merge conflict
This merge has conflicts. You must resolve the conflicts before merging the pull request:
Step 1: Fetch the changes and checkout the destination branch.

git fetch 
git checkout master

Step 2: Merge the source branch and resolve conflicts as appropriate.

git merge -m "Merge pull request #4 from feature-branch to master" --log --no-ff feature-branch

Step 3: After the merge conflicts are resolved, commit the changes and push.

git commit 
git push origin HEAD

First off all. You must merge master into feature-branch, but not a feature-branch to master. You should make Pull Request is valid to merge via button in web interface. Not a merge with bypass it.

The permissions to push changes into master is only on some lead developers. If all start to resolve conflict, this make them very unhapy. Only author of feature-branch must merge conflicts, but author has no access to push into master.

You should done resolve conflicts by this commands:

git fetch
git checkout feature-branch
git merge --no-ff master
git push origin feature-branch

This make opened Pull Request available to merge from web interface.