git merge --no-ff test-dev
Auto-merging test.txt
CONFLICT (content): Merge conflict in test.txt
Automatic merge failed; fix conflicts and then commit the result.
打开冲突文件,解决冲突
git add .
git commit -m '11'
git push
git merge --no-ff test-dev
Auto-merging test.txt
CONFLICT (content): Merge conflict in test.txt
Automatic merge failed; fix conflicts and then commit the result.
打开冲突文件,解决冲突
git add .
git commit -m '11'
git push