From 652cad3640fcc2b313f21a631ba633bc46f3ffc9 Mon Sep 17 00:00:00 2001
From: Le Tian Ren <renlet@cn.ibm.com>
Date: Mon, 16 Jun 2014 02:13:41 +0800
Subject: [PATCH] add the missing 'handle conflict' in merge section

---
 README.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/README.rst b/README.rst
index 68f08e6..a738161 100644
--- a/README.rst
+++ b/README.rst
@@ -56,6 +56,26 @@ merge
   doing the merge has to figure out the best merge base for themselves. This
   makes merging a heck of a lot easier in Git than in these other systems.
 
+* handle conflicts
+
+  Automatic merge failed; fix conflicts and then commit the result.
+
+  git status
+
+  Git adds standard conflict-resolution markers to the files that have
+  conflicts, so you can open them manually and resolve those conflicts, or use
+  (git mergetool).
+
+  conflict section looks like:
+
+  <<<<<<< HEAD (current branch)
+  abcd
+  =======
+  1234
+  >>>>>>>> <branch-to-merge>
+
+  After fix the conflict, git add and git commit.
+
 see [ref.2]_
 
 rebase