From 12a2e62db5909e0ca5552f5e800a0e69d683b35b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 26 Jan 2016 18:38:51 +0530
Subject: [PATCH] [IMP] explain what to do next on README file

---
 README.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/README.md b/README.md
index 60324ce..035a7e3 100644
--- a/README.md
+++ b/README.md
@@ -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 git@github.com: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