forked from mart-e/git-training
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[IMP] explain what to do next on README file
- Loading branch information
Showing
1 changed file
with
31 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 |
---|---|---|
|
@@ -15,3 +15,34 @@ $ git branch | |
* master | ||
``` | ||
|
||
2. fork it on your GitHub account | ||
|
||
From the web interface, at https://github.com/mart-e/git-training | ||
|
||
3. Add your new remote | ||
``` | ||
$ git remote add my_user [email protected]:my_account/git-training.git | ||
``` | ||
|
||
What to rebase? | ||
=============== | ||
|
||
``` | ||
$ git branch -r | ||
origin/HEAD -> origin/master | ||
origin/master | ||
origin/rebase-withconflict | ||
origin/simple-rebase | ||
``` | ||
|
||
Simple | ||
------ | ||
1. create a local fork of **origin/master** (e.g. `my-master`) and push it on **your** remote | ||
2. fetch the branch **origin/simple-rebase** | ||
3. rebase **simple-rebase** onto your master | ||
|
||
Conflict | ||
-------- | ||
1. fetch the branch **origin/rebase-withconflict** | ||
2. rebase **rebase-withconflict** onto your master (with simple-rebase already there) | ||
3. resolve the conflicts |