MadCap Software Forums

With MadCap Central as my repository, I used Flare to merge one branch into another and the merge just hung forever. I canceled out of the merge, deleted my index.lock file (in the .git folder) and rebooted but now receive this error when trying to pull again.
Pulling local changes from remote...
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.

There is nothing to commit and there are no pending changes. Do I need to delete more from the .git folder in order to proceed/retry merge?

What do you see when you type 'git status'?

Musta been a hiccup or lag time?
Git status now shows:
On branch branchnamehere
Your branch is up to date with branchnamehere
nothing to commit, working tree clean

Problem seems to have resolved itself, tho not convinced the merge merged anything...