mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-11-11 19:04:50 +01:00
Clarify instructions for the "Moving branches around" level
Closes #77.
This commit is contained in:
parent
74b59cff0a
commit
2b3903a599
1 changed files with 10 additions and 2 deletions
|
@ -5,9 +5,17 @@ cards = checkout commit-auto merge reset-hard
|
|||
|
||||
One of your colleagues messed up here, and put the branches in the wrong timelines!
|
||||
|
||||
You could delete and re-create these branches - but you can also directly move them to different commits, using `git reset --hard`.
|
||||
You could delete and re-create these branches - but you can also directly move them to different commits, by using
|
||||
|
||||
The donut branch is in the right place, but the timeline is still incomplete.
|
||||
git checkout
|
||||
|
||||
on the branch names, and then using
|
||||
|
||||
git reset --hard
|
||||
|
||||
on the commit where you want the branch to be.
|
||||
|
||||
The donut branch is in the right place, but the timeline is still incomplete - make you actually *eat* the donut in that branch!
|
||||
|
||||
[setup]
|
||||
|
||||
|
|
Loading…
Reference in a new issue