You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
John SJ Anderson d131de403d G 1 year ago
A F 1 year ago
D D 1 year ago
E E 1 year ago
F F 1 year ago
G G 1 year ago
LICENSE Initial commit 1 year ago Initial commit 1 year ago

Rebase exercise two

Rebase the my-feature branch onto the tip of the master branch.

Note that this time you should have to resolve a merge conflict during the rebase! Explore what happens if you git rebase --abort. Does picking one side of the conflict versus the other produce different results?

Your final commit graph should look like this:

* f3671b4 - (HEAD -> my-feature) C
* 7ebc3ce - B (3 seconds ago)
* 720cb51 - A (3 seconds ago)
* 3348afd - (master) G
* 9d07566 - F
* 28e0f84 - E
* 767de60 - D
* e29a1f7 - Initial commit

(Note that your SHAs will be different.)