CODEWITHSUNDEEP
gitvisual-studiomerge
CDBaker98
CDBaker98

Reputation: 1

How can I abort a merge in progress with no changes in Visual Studio?

I have been working on a git repository that was originally forked from another. In order to also keep up with changes made to the original, a while back I had set the upstream repository as another remote using the following command:

$ git remote add upstream https://github.com/user/repo.git

there were a few very minor changes (like 2-4 lines) that I made note of to the original repo's creator, and then made them in my own fork. The original repo was then updated with the same changes.

Now, I was trying to make sure no other changes had been made upstream that I needed to pull. There were not, and after running git pull upstream master, I am stuck with a merge in progress that does not commit any changes. Under my Git Changes tab, it says "Merge in progress" and "Enter a message ", but there are no changes, staged or unstaged.

I have tried git merge --abort, but that comes back with "fatal: there is no merge to abort (MERGE_HEAD missing)".

Is there anything else I can try?

Upvotes: 0

Views: 17

Answers (0)

Related Questions