使用Eclipse合并git中的冲突

Question

Hi I am facing a merge conflict using git in eclipse.

Basically I am trying to synch two branches ie branch A and branch B. So while synching Branch B with branch A conflicts occurred. Hence to resolve these conflicts all the files have been marked as merged and has been committed and pushed.

But again while synching with branch B with branch A the same files are shown in conflicts mode with no changes shown in files diff..

Can anyone suggest how to resolve this issue?

Answer 1

Before merging your changes from branch B(ex: development) to branch A(ex: master), get the latest changes from the branchA to branchB and resolve the conflicts

 $ git checkout branchB  # Ignore this if you've already in the branchB

 $ git merge branchA  # This will merge recursively and show conflicts if any. so resolve the conflicts and commit on 'branchA"

 $ git commit -m "resolving conflicts and merging from branchA to branchB"

 $ git checkout branchA  # Assuming this is master branch 

 $ git merge branchB  # Now this shouldn't show any conflicts since it's resolved earlier

Now branchA and branchB both are having the same changes!