Diff not showing After Pull the file in Eclipse

Rishi Kumar Sah

We Are Using Eclipse Hellos G2 and JAVA 7

 

we have created a project in bit bucket and a team member committed his code in his branch. when i am merging  the file in master branch then showing conflict in some files. then i  pull the file and open in eclipse thenit is not showing the conflict in eclipse . Only showing update file and when we try to commit then showing 'nothing to commit, working tree clean' and nothing gets committed and also does not show marge option in bit bucket.

Please help.

 

Thanks in advance

Theodora Boudale

Hi @Rishi Kumar Sah and welcome to the community!

You will need to try to merge the two branches locally in order for the conflicts to show. I don't know if Eclipse provides a way to do this.

We have the following guide that has step-by-step instructions on how to resolve conflicts locally using a command line application:

• https://support.atlassian.com/bitbucket-cloud/docs/resolve-merge-conflicts/

Kind regards,
Theodora