Skip to content

Instantly share code, notes, and snippets.

@danielpclark

danielpclark/git-workflow.md

Created July 8, 2020 13:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save danielpclark/3d6b7f1195259e7a81287725ece85dd0 to your computer and use it in GitHub Desktop.
Save danielpclark/3d6b7f1195259e7a81287725ece85dd0 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-workflow.md

Merging a PR in to develop

Using a branch named EXAMPLE_BRANCH:

git checkout develop
git fetch --all
git rebase origin/develop
git checkout EXAMPLE_BRANCH
git rebase develop
git checkout develop
git rebase EXAMPLE_BRANCH
git diff origin/develop
git push origin develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment