To go to last state after a conflicted merge:

git reset –merge ORIG_HEAD

To know the current active branch
git branch
this command show all branches available on local and highlights the active one.

To know all available branch
git branch -a

Leave a Reply

Your email address will not be published. Required fields are marked *