Forcefully abort merge in progress in TFS/Visual Studio

Question

I was in the middle of a merge in TFS, but I want to abort my merge because there are a couple of things I need to fix in my files before I merge.

When I click on the Abort option though, nothing happens. I saw my cursor have a spinner icon for about 10 seconds, but that's about it--nothing else happened. Restarting Visual Studio didn't help either.

Is there any way I can force an abort on this merge?

Answer 1

We have a GitKraken license, and ended up switching over to that to see if I could do things over there. Unfortunately GitKraken couldn't do much either, so we ended up deleting my local repository and checking it out again.

Since I think this was a git merge done thru VS, we probably could've done a git merge --abort--though I'm not sure if we would've run into this issue too. I've just never been too comfortable with the git CLI other than the very basic fetch/pull/push.

In the end, what I was working on was only a few files I created, all of which were < 20 lines and I just made quick backups of them. Not an ideal solution unfortunately...but it got the job done. :/