hope fixed

zzlinux · Mar 27, 2016 · c747675 · c747675
2 parents e11f16c + 939e483
commit c747675
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/git_learn.txt b/git_learn.txt
@@ -10,6 +10,10 @@
 10.git checkout -b new branch
 11.git branch new branch	git checkout new branch 
 12.git merge dev	git branch -d new branch
-13.conflict fixed
-14.git merge --no-ff -m "merge with no-ff"
-15.hello word
+<<<<<<< HEAD
+13.git merge --no-ff -m "merge with no-ff"
+14.conflict fixed
+=======
+13.git merge --no-ff -m "merge with no-ff"
+14.conflict fixed
+>>>>>>> dev