-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Mathieu Haverkamp
committed
Nov 14, 2024
1 parent
9f9ac1a
commit 99100ce
Showing
1 changed file
with
24 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,26 @@ | ||
# git-gud | ||
Git testing and demonstration repo | ||
|
||
# Exercises! | ||
|
||
## Squash me! | ||
|
||
Checkout branch `feature/squash-me`. | ||
|
||
Look at the latest commit history. What a mess! Those latest commits all revolve around a single change, and could have been a single commit. | ||
|
||
Squash the commits into a single atomic commit. | ||
|
||
Don't forget to push! | ||
|
||
## Rebase me! | ||
|
||
Checkout branch `feature/rebase-me-with-dev`. | ||
|
||
Oh no! This branch has diverged from `develop` and now there's a conflict! | ||
|
||
No worries! We can *rebase* `feature/rebase-me-with-dev` onto `develop` to clean this up. | ||
|
||
Rebase `feature/rebase-me-with-dev` onto the latest version of `develop`. | ||
|
||
Don't forget to push! |