GIT reset branch and delete all changes after merge

Question

I had two branches, the main one and a feature branch. After changing something in the main branch (I know now, that's bad practice. I found out the best practice for changes and I'll do it by the book next time) I merged the main branch into the feature branch.

The merge went bad, so I reset the branch back to the last commit before the merge. This went well. Only problem is, if I want to commit any new changes, the merge gets included again.

I tried rebasing the branch, I wasn't successful.

I just want to completely delete the merge and get back to the last commit, Is that possible?

Answer 1

Hope is by now you've figured out you shouldn't develop directly on the main branch. You should take the following steps:

1. Reset your main branch to before the merge
2. Rebase your feature branch on top of main branch
3. Make your changes in the feature branch, commit and what not
4. Go to main branch and merge feature branch into it

Answer 2

如果由于冲突而不想合并它，请尝试使用git merge --abort命令。