A local branch:-
\'feature/100\'
And Remote branches:-
\'master\'
\'Version2\'
Accid
It's probably too late, but if you want to rewind your pushed branch (master
?) by one commit, issue the following command:
git push origin +master^:master
+
makes the push forced, master^
describes the previous-last commit. :master
pushes to the remote master branch.
You can revert the merge commit on master. When you later really want to merge the branch, you will have to revert the revert first. For a detailed explanation, see here:
http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt
You can either:
Revert your change
git revert HEAD
This 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~1
git push origin master --force
You 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