You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
4 lines
295 B
4 lines
295 B
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
|