Simple one liner
I have always used
git reset --merge
I can't remember it ever failing.
Note: git reset --merge
will discard any staged changes
I have always used
git reset --merge
I can't remember it ever failing.
Note: git reset --merge
will discard any staged changes