在将功能合并到主分支期间无法合并二进制文件

Question

我是git东西的新手，我需要帮助来解决这个问题。

我遇到了合并问题。

C:workAutomation LearningAutomation-testing-practise>git merge dev_indianGuy
warning: Cannot merge binary files: target/classes/com/kits/sit/Base_Setup/Base_Setup.class (HEAD vs. dev_indianGuy)
Auto-merging target/classes/com/kits/sit/Base_Setup/Base_Setup.class
CONFLICT (content): Merge conflict in target/classes/com/kits/sit/Base_Setup/Base_Setup.class
Automatic merge failed; fix conflicts and then commit the result.
C:workAutomation LearningAutomation-testing-practise>git push origin master
Everything up-to-date
C:workAutomation LearningAutomation-testing-practise>git checkout dev_indianGuy
error: you need to resolve your current index first
target/classes/com/kits/sit/Base_Setup/Base_Setup.class: needs merge
C:workAutomation LearningAutomation-testing-practise>git checkout

我的 git 存储库链接：https://github.com/dib1987/Automation-testing-practise

谢谢。

Answer 1

工作副本中的文件仍然是当前分支的副本 - 换句话说，合并尝试没有修改它。要解决冲突并保留此文件，请执行以下操作：

git add Base_Setup.class
git commit –m “My commit message for the merge”