# update the dev/<featureA> branch
git checkout dev/<featureA>
git fetch -p
git merge
# checkout the existing remote branch
git checkout <remote-branch> # e.g. git checkout dev/featureA$feat/Login
git rebase dev/<featureA> # if there were changes in dev/<featureA>, then after having merged 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>
Created
December 20, 2018 19:59
-
-
Save nmpegetis/1da7dd55bc01f135f53ae8cb6b2eadb0 to your computer and use it in GitHub Desktop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment