Ok so i manually solved ALL conflicts and the file list shows that there are no conflicts.
as you can see here http://prntscr.com/8j3j14
but the button merge shows there is a conflict, but in reality there is none. There just isnt, everything should just work, but doesnt.
Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs