git-advanced

Merge conflicts during rebase occur when Git cannot automatically combine changes. Interactive rebase pauses at conflicting commits, letting you manually resolve differences in affected files, then continue the rebase. This keeps your branch history clean before merging.

Cherry-pick selectively applies a specific commit from one branch to another without merging the entire history. Find the commit hash on the source branch, switch to your target branch (e.g., v1.0.95-patch), then cherry-pick that commit to backport the fix safely.

Interactive rebase lets you squash, reorder, and edit commits on your feature branch. Run git rebase -i to open an editor, mark commits to squash into logical units, and resolve any conflicts. This produces a clean history before merging to main.

Annotated tags store metadata—author, date, and message—making them ideal for release workflows and reproducible version histories. Lightweight tags are just branch references. For production releases, annotated tags provide traceability and are safer for version management.

Yes. If a rebase fails, use git rebase --abort to return to your original branch state. To undo commits already pushed, create a new commit that reverses changes, or use git reset on local commits before pushing. Both preserve safety by avoiding destructive history rewrites on shared branches.

Delete a tag with git tag -d [tag-name] locally or git push origin --delete [tag-name] remotely. Move a tag by deleting it and recreating it at a new commit, or force-move with git tag -f. Manage annotated tags for releases to keep version history accurate across branches.