A local branch:-
‘feature/100’
And Remote branches:-
‘master’
‘Version2’
Accidently,
- I have merged my feature branch ‘feature/100’ to the master
- Also pushed it to the remote repository.
But in real ‘feature/100‘ should have been merged into remote branch ‘Version2‘
How I fixed it (partially):-
i have merged the feature branch ‘feature/100‘ to the remote branch ‘Version2‘ and pushed it to the server.
git checkout Version2
git merge --squash feature/100
git add .
git commit -m 'New message'
But I want to delete the last push I have merged and commit to the master branch. How?
Side Note I am only one working on this project.. So even if pushed commit is deleted it won’t harm anyone else
You can either:
Revert your change
git revert HEADThis will create a new commit that reverts the changes that you just pushed up to master. This is the safest option because other people may have already pulled down the change that you have pushed up.
Change your commit history and force push the change
You can remove the commit that you just pushed up with:
git reset --hard HEAD~1git push origin master --forceYou don’t want to do this unless you’re absolutely sure that no one has pulled down your changes from master.
For more info, see Delete commits from a branch in Git