git-essentials

To undo a git commit while keeping changes staged, use `git reset --soft HEAD~1`. This moves your HEAD pointer back one commit, leaving your files and index exactly as they were before the commit.

Git reset moves the branch pointer backward, effectively erasing commits from history, while git revert creates a new commit that inverses the changes of a specific commit, preserving the original history safely for shared branches.

To resolve merge conflicts during a git branch merge, open the conflicted files, manually edit the marked sections to keep the desired code, run `git add` to stage the resolved files, and finish with `git commit`.

Use git stash instead of committing when you need to temporarily save uncommitted changes to switch branches or pull updates without creating a messy, incomplete commit in your project history.

The best way to sync a local branch with a remote repository is using `git fetch` to download remote changes without modifying your working directory, followed by `git pull` or `git rebase` to integrate them.

Git rebase can fail due to unresolved merge conflicts; you can recover lost commits or undo a failed rebase by using `git reflog` to find the previous HEAD state and running `git reset` to restore it.