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...
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
rm .git/MERGE_HEAD
Should do the trick !
Still have a question?
Get fast answers from people who know.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.