Skip to content

/ learnGitBranching

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.

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

lesson on 'juggling commits level 2' is confusing #638

Open
1dropaflame opened this issue Feb 16, 2020 · 3 comments
Open

lesson on 'juggling commits level 2' is confusing #638

1dropaflame opened this issue Feb 16, 2020 · 3 comments

Comments

@1dropaflame
Copy link

@1dropaflame 1dropaflame commented Feb 16, 2020

The lesson says to do

git rebase HEAD~2
git commit --amend
git rebase HEAD~2

but it doesn't say what to do in the rebase.
Also solutions are not available so one cannot progress until one gets it correct or see what the correct solutions were.
@pcottle
Copy link
Owner

@pcottle pcottle commented Feb 18, 2020

are you sure you mean juggling commits level 2? level 1 is the one with the interactive rebase. level 2 has a different solution:
Screen Shot 2020-02-18 at 5 00 41 PM
@1dropaflame
Copy link
Author

@1dropaflame 1dropaflame commented Mar 29, 2020

@Nubosch
Copy link

@Nubosch Nubosch commented Oct 4, 2020

Imo, the solution to 3: Juggling Commits #2 would be git rebase -i with edit for amend. Please consider adding "full" possibilities for interactive rebasing. The chain rebase, amend, rebase feels wrong.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
3 participants
@pcottle @Nubosch @1dropaflame
You can’t perform that action at this time.