To create and then merge changes into a branch

create_merge_branches

ex.
git checkout origin master
git pull origin master

--create branch and track master
git checkout -b f1-1234 origin/master
--make changes

--resolve conflicts, DO NOT PUSH branch, the merge is just to resolve conflicts
git commit -a -m"changed config"
git merge master

--check that the changes for the pull request match the merge 
--ex. from the pull request diff page Showing 7 changed files with 86 additions and 37 deletions.
git checkout master
git merge f1-1234
--resolve conflicts

git push origin master