更新时间:2022-05-25 02:01:22
需要这种递归合并策略是从EGit开始的默认3.0(请参阅错误380314 )。
如果您使用的是旧版本,请参阅下载页面进行升级
In case you are using an older version, see the download page for upgrading.
或者,在进行最后一次合并之前,尝试重新设置为上次本地提交,然后与 origin / master
合并。然后,如果您在原始合并之上进行更多更改,请选择这些。
Alternatively, try resetting to your last local commit before you made the last merge, and then merge with origin/master
. Then if you made more changes on top of the original merge, cherry-pick these.
另一种可能性是使用C git(在控制台上)进行合并,它可以处理这种情况。
Another possibility would be to do the merge using C git (on the console), it can handle that situation.