Setting your branch to exactly match the remote branch can be done in two steps: If you want to save your current branch’s state before doing this (just in case), you can do: Now your work is saved on the branch “my-saved-work” in case you decide you want it back (or want to look at … Read more
With git reflog check which commit is one prior the merge (git reflog will be a better option than git log). Then you can reset it using: There’s also another way: It will get you back 1 commit. Be aware that any modified and uncommitted/unstashed files will be reset to their unmodified state. To keep them either stash changes … Read more
Undo a commit & redo This command is responsible for the undo. It will undo your last commit while leaving your working tree (the state of your files on disk) untouched. You’ll need to add them again before you can commit them again). Make corrections to working tree files. git add anything that you want … Read more