how do i resolve this? as far as I know I have resolved all conflicts, i just need to complete the merge and commit the changes. but the product wont let me and doesnt give me any clues as to what I am meant to do next!
Turns out not selecting "amend last commit" was the solution...
rm .git/MERGE_HEAD
Should do the trickĀ !
It looks like you're new here. Sign in or register to get started.
