Skip to content

Instantly share code, notes, and snippets.

@nmpegetis

nmpegetis/Git:-Change-commit-push-checkout-local.md

Created December 20, 2018 20:00
Show Gist options
  • Save nmpegetis/0a6fede9338eac1b661fc08f05641fed to your computer and use it in GitHub Desktop.
Save nmpegetis/0a6fede9338eac1b661fc08f05641fed to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Git:-Change-commit-push-checkout-local.md 
# update the dev/<featureA> branch
git checkout dev/<featureA>
git fetch -p
git merge

# checkout the existing local branch
git checkout <local-branch> # e.g. git checkout dev/featureA$feat/Login
git merge                   # merge possible changes made in remote-branch that the local branch tracks. There may appear conficts fix them first and then continue.
git rebase dev/<featureA>   # if there were changes in dev/<featureA>, then after having merged twice above, re-base the <remote-branch> on dev/<featureA> to apply all changes again on the new base that is set from the dev/<featureA>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment