Merge Conflict !!
Created originally on Bitbucket by Faruk Aydoğan
I am developing my project from two different computers and I have repo on bitbucket. I push my repo three ours ago from my computer. And three ours later I can not pull my changes, I get this error and I have no idea to fix it:
An error occurred. Detailed message: An error was raised by libgit2. Category = Checkout (MergeConflict). 15 conflicts prevent checkout
Is there anyone can help me please.