false positive merge conflicts in stash

Radek April 6, 2017

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
Community Leader
Community Leaders are connectors, ambassadors, and mentors. On the online community, they serve as thought leaders, product experts, and moderators.
September 1, 2021

Any chance the line endings are different? 

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events