修复和推送git合并冲突的事件序列
我刚刚将修复和推送git合并冲突的事件序列,git,git-merge,Git,Git Merge,我刚刚将develope合并到我的功能分支中(通过git merge develope),得到了大约20个合并冲突。当我执行git status时,我会看到如下输出: new file: src/test/resources/com/example/mapper/test/TestAccountMapper.xml new file: src/test/resources/vc-import-data/DATAFILE-unwrapped.xml
develope
合并到我的功能分支中(通过git merge develope
),得到了大约20个合并冲突。当我执行git status
时,我会看到如下输出:
new file: src/test/resources/com/example/mapper/test/TestAccountMapper.xml
new file: src/test/resources/vc-import-data/DATAFILE-unwrapped.xml
new file: src/test/resources/vc-import-data/DATAFILE.xml
Unmerged paths:
(use "git add <file>..." to mark resolution)
both added: src/main/java/com/example/bean/Account.java
both added: src/main/java/com/example/bean/Address.java
both added: src/main/java/com/example/bean/Customer.java
both added: src/main/java/com/example/mapper/AccountMapper.java
both added: src/main/java/com/example/mapper/CountryMapper.java
both added: src/main/resources/com/example/mapper/AccountMapper.xml
both added: src/main/resources/com/example/mapper/AddressMapper.xml
both added: src/main/resources/com/example/mapper/CustomerMapper.xml
both modified: src/main/resources/endpoints.properties
both added: src/test/java/com/example/mapper/AccountMapperTest.java
both added: src/test/java/com/example/mapper/CustomerMapperTest.java
both modified: src/test/resources/test-endpoints.properties
新文件:src/test/resources/com/example/mapper/test/TestAccountMapper.xml
新文件:src/test/resources/vc import data/DATAFILE-unwrapped.xml
新文件:src/test/resources/vc import data/DATAFILE.xml
未合并路径:
(使用“git add…”标记分辨率)
两者都添加了:src/main/java/com/example/bean/Account.java
两者都添加了:src/main/java/com/example/bean/Address.java
两者都添加了:src/main/java/com/example/bean/Customer.java
两者都添加了:src/main/java/com/example/mapper/AccountMapper.java
两者都添加了:src/main/java/com/example/mapper/CountryMapper.java
两者都添加了:src/main/resources/com/example/mapper/AccountMapper.xml
两者都添加了:src/main/resources/com/example/mapper/AddressMapper.xml
两者都添加了:src/main/resources/com/example/mapper/CustomerMapper.xml
都已修改:src/main/resources/endpoints.properties
两者都添加了:src/test/java/com/example/mapper/AccountMapperTest.java
两者都添加了:src/test/java/com/example/mapper/CustomerMapperTest.java
都已修改:src/test/resources/test-endpoints.properties
我现在已经检查了每个冲突的文件,并手工合并了所有内容。我能做一个git add.&&git提交-m“已解决合并冲突”和&git推送?或者我还需要做其他事情吗(如果需要,顺序是什么)?您可以这样做
git add--all,
git commit-m“comments”然后
git push origin功能
git add.
后跟git merge--continue
应该可以与最新的git一起使用。我可以只做。。。是的,就是这样。请注意,git merge--continue
只运行git commit
(在确保完成合并之后);它并不是超级新的,它已经存在了一段时间,而且它比显式的git commit
更好,因为它会反复检查您是否知道自己在做什么。但是你肯定可以直接运行gitcommit
,在糟糕的过去,你必须这样做。