2011-05-25 MERGE_HEAD exists git fatal: You have not concluded your merge. (MERGE_HEAD exists) とでたら、 git reset --merge とすればいい