forked from Workshops/How-To-Git-Started
fix merge
This commit is contained in:
parent
27387ef10b
commit
13f0023a28
@ -29,4 +29,4 @@ undo
|
|||||||
git checkout master <br/>
|
git checkout master <br/>
|
||||||
git rebase feature <br/>
|
git rebase feature <br/>
|
||||||
git checkout feature <br/>
|
git checkout feature <br/>
|
||||||
git merge <br/>
|
git merge master <br/>
|
||||||
|
Loading…
Reference in New Issue
Block a user