Merge branch 'dhy' into dev

7 months ago · 9564971d10
1 changed files with 1 additions and 0 deletions
--- a/dhy.txt
+++ b/dhy.txt
@ -1,3 +1,4 @@
 git checkout dhy -- aaa.txt 强制合并dhy中的aaa.txt文件
 git diff dev dhy -- aaa.txt
 git merge dhy --no-edit  不需要每次合并都编辑
 git branch里面有 master 没有dev 所以需要让本地dev和远程dev关联上：git branch --set-upstream-to=origin/dev dev 然后 再 git push