git-workflows

Run git status to see conflicting files, then open each file and edit the conflict markers to keep the current version, the incoming version, or a combination of both. Stage the resolved files with git add, then continue with git rebase --continue, git merge --continue, or git commit depending on the operation.

Use git rebase main to update a feature branch with the latest changes, keeping history linear. Use git merge when integrating a feature into main or working on collaborative branches where preserving history matters. Quick one-off fixes can go directly to main.

Stage the fix and run git commit --fixup=<target-commit-hash>, then run GIT_SEQUENCE_EDITOR=: git rebase -i --autosquash <oldest-target-hash>^. This folds the fix into the original commit, keeping history atomic without standalone fixup commits.

Use git reflog to view the history of HEAD changes and find the commit hash before the loss. Restore with git reset --hard HEAD@{n} or recreate a deleted branch with git checkout -b recovered-branch HEAD@{n}.

Force pushing overwrites remote history and can cause others to lose work, so never force push to main or master. If you must rewrite a pushed branch, use git push --force-with-lease and confirm with your team that no one else is using the branch.

Avoid it when commits are already shared and team policy forbids rewriting history, or when the fix is genuinely new work that deserves its own commit. It is designed for folding follow-up fixes into the commits they belong to.