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.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...
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