强制git合并提交

Question

We have been trying to merge 2 branches together for a couple of days now yet we still have a few problems. Git appears to skip some commits that it believes are already in the branch.

If we run git branch --contains CommitHash then it shows the commit to be in the develop branch, however if we run git log on the folder the commit contains it doesn't show the commit in the branch.

Is there a way to force git to merge in these commits?

Any help would be appreciate as it

Andy

Answer 1

您可以使用git cherry-pick将这些提交强制到另一个分支，但是我不建议这样做，因为您可能只是在查看日志中的更改。