Skip to content

Commit

Permalink
[IMP] explain what to do next on README file
Browse files Browse the repository at this point in the history
  • Loading branch information
mart-e committed Jan 26, 2016
1 parent 8a2912a commit 12a2e62
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 12a2e62

Please sign in to comment.