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.

Atlassian Community about banner
4,299,996
Community Members
 
Community Events
165
Community Groups

false positive merge conflicts in stash

I am using 2.8 on my linux workstation. I am re-basing branch, normal procedure, resolved bunch of conflicts and push my new branch after rebase to stash.

Now the problem is that stash shows me conflicts:

  1. which do not exist locally on my branch, on local files
  2. the conflicted lines looks identical, example below

stash_conflict.png

1 answer

0 votes
Charlie Misonne Community Leader Sep 01, 2021

Any chance the line endings are different? 

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

2,248 views 2 9
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you