Skip to content

Instantly share code, notes, and snippets.

@janetlee
Created May 24, 2018 17:45
Show Gist options
  • Save janetlee/af5fa14c93ca9b1970de9e6d0d74388d to your computer and use it in GitHub Desktop.
Save janetlee/af5fa14c93ca9b1970de9e6d0d74388d to your computer and use it in GitHub Desktop.
I made this page for myself because everything online doesn't mention clearly to fetch the origin and bring your local develop branch up to date with the repo.
git fetch origin -- to get all the remote branches
git pull origin develop -- to ensure your development branch is fully up to date. The response should be up to date, but you never know
git checkout release/X.XX -- to choose release/X.XX as your base branch
git pull – to update the release branch again because you never know what your colleagues are doing
git checkout -b X.XX-hotfix/JIRA-9999 -- to cut a new branch off release/X.XX base branch
git cherry-pick SHA1 -- cherry pick SHA in order to apply them. This is the first SHA to apply.
git cherry-pick SHA2 -- cherry pick the second SHA to apply
git push origin X.XX-hotfix/JIRA-9999 -- push cherry picked commits
In GitHub, make a new PR by comparing to the release/X.XX branch.
Do not do it against develop branch or you will have everyone else's commits in the PR. No bueno.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment