false positive merge conflicts in stash
Radek
I'm New Here 
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
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:
- which do not exist locally on my branch, on local files
- the conflicted lines looks identical, example below
1 answer
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.