my team , worked on 6 branches.
yesterday merged branches one.
today did bugfixing.
want continue on our branches.
but before, needs merged code.
we dont want create new branches copy master these 6 branches.
what correct way this?
why wouldn't want create new branches? git branches lightweight, means references pointing commit. creating new branch should matter of starting work reference points same commit master
does:
switch
master
:git checkout master
make sure
master
up-to-date:git pull --ff-only
create new branch:
git checkout -b <new-branch-name>
if instead of creating new branches, still prefer work on same branch before, can make branch point latest master
:
switch existing branch:
git checkout <existing-branch-name>
make current branch point same commit
master
:git merge --ff-only master
Comments
Post a Comment