Question

I am Using GitHub for version Control

Unfortunately, I merged the branch with master using the below code

git checkout master
git merge updating-users

Now, I just want to know , How to de-merge the branch(updating-users) from master?

Answer 1

From within master, do a git reset --hard #commit_id to the most recent good commit on master. (You can get the commit id by going git log.) The updating-users branch will be unaffected.

If you’ve already pushed the merge to GitHub, you’ll have to push again and pass --force since you’ve overwritten the history.