Cant commit after starting a merge in Sourcetree

You can manually delete .git/MERGE_HEAD and Git won’t be able to tell that you were just doing a merge. It will let you amend the previous commit with the changes in your index just like normal.

Please read:

Though this would work, it is a hack and not recommended. All is needed here is to let git know the merge is completed git commit -a as per this answer

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)