Explorar el Código

fix(test):从newb1分支cherry-pick功能。

linbo tang hace 5 años
padre
commit
62ebbb05ba
Se han modificado 1 ficheros con 0 adiciones y 3 borrados
  1. 0 3
      README.md

+ 0 - 3
README.md

@@ -3,11 +3,8 @@ This is a test commit
 This is second test commit
 This is second test commit
 This is a test commit to remote newbranch.
 This is a test commit to remote newbranch.
 This is a test commit from test1 to remote newbranch1.
 This is a test commit from test1 to remote newbranch1.
-<<<<<<< HEAD
 This is a new commit from test1 to remote newbranch.
 This is a new commit from test1 to remote newbranch.
 This is an new commit from test1 to remote newbranch.
 This is an new commit from test1 to remote newbranch.
 test the git template.
 test the git template.
 This is an new commit from newb to remote newbranch.
 This is an new commit from newb to remote newbranch.
-=======
 This is a test commit from newb1 to remote newbranch1.
 This is a test commit from newb1 to remote newbranch1.
->>>>>>> 5108c05... feat(Readme):在Readme中添加新需求,并提交到远端newbranch1分支。