GitHub PR management and merge example

git-pr-commands

MERGE PR - Have issued pr to upstream branch:

1. Open target repo in cmd
2. git checkout develop
3. git checkout -b test-branch-name develop
   *create and switch to a new branch, from develop to test the pr changes
4. git pull https://github.com/account/fork-repo.git pr-branch-name
   *pull the whole pr branch into test branch
5. Review changes in test branch
6. git checkout develop
   *if happy then switch to branch you wish merge the test branch to
7. git merge test-branch-name
   *merge the test branch into develop. Don't use '--no-ff' to avoid merge commit.
    Can use cherrypick at this stage to select specific commits instead of merging the whole test branch.
8. git push origin develop
   *update the remote develop branch

MERGE DEV INTO MASTER BRANCH:

1. git checkout master
2. git merge develop
3. git push origin master