Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Get started Tell me more
Atlassian Community about banner
4,559,995
Community Members
 
Community Events
185
Community Groups

Diff not showing After Pull the file in Eclipse

Rishi Kumar Sah
Rishi Kumar Sah Nov 07, 2022

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

Answer
Watch
Like Be the first to like this
152 views

1 answer

0 votes
Theodora Boudale
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Nov 09, 2022

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:

Kind regards,
Theodora

Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Site Admin
TAGS
AUG Leaders

Atlassian Community Events

See all events