Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Level: Basics 6 - "Rebasing Instead" #261

Open
benthayer opened this issue Aug 5, 2020 · 0 comments · May be fixed by #290
Open

Level: Basics 6 - "Rebasing Instead" #261

benthayer opened this issue Aug 5, 2020 · 0 comments · May be fixed by #290
Assignees
@benthayer
Labels
level - educational Additional levels for the game
Milestone
1.0

Comments

@benthayer
Copy link
Owner 

Rebasing Instead - Show that a rebase can also be used to merge changes together.

This level demonstrates that you can check out branches and merge them to combine their files. It doesn't make an effort to show what branches are.

The branching structure would be like this:
setup.spec

1
2 (master)
3 : 1 (branch)
branch

test.spec

1
2
3' (master, branch)
master

gg solution

git rebase master
git checkout master
git merge branch

Similar to #248 and others, we would have git gud status output showing the state of the different commits

Working Directory
 intro.txt - "Once upon a time there was a princess"
 middle.txt - "She lived a fulfilling life"
 ending.txt - "And then she died"
Staging Area
 intro.txt - "Once upon a time there was a princess"
 middle.txt - "She lived a fulfilling life"
 ending.txt - "And then she died"
Commit 1
 intro.txt - "Once upon a time there was a princess"
Commit 2
 intro.txt - "Once upon a time there was a princess"
 middle.txt - "She lived a fulfilling life"
Commit 3 (master, branch)
 intro.txt - "Once upon a time there was a princess"
 ending.txt - "And then she died"
@benthayer benthayer added the level - educational Additional levels for the game label Aug 5, 2020
@benthayer benthayer added this to the 1.0 milestone Aug 5, 2020
@benthayer benthayer mentioned this issue Aug 5, 2020
Open
8 tasks
@benthayer benthayer self-assigned this Aug 6, 2020
This was referenced Aug 8, 2020
Closed
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@benthayer benthayer

Labels
level - educational Additional levels for the game
Projects
None yet
Milestone
1.0
Development

Successfully merging a pull request may close this issue.

Level: Rebasing Instead benthayer/git-gud
1 participant
@benthayer