git-advanced

Git bisect isolates faulty commits by performing a binary search through your project history. You start the bisect workflow, mark commits as good or bad, and the system automatically checks out intermediate commits to pinpoint the exact change that introduced the bug.

Git rebase is the best way to rewrite history for clean merges. It replays your local commits onto a target branch, allowing you to resolve conflicts interactively and maintain a linear, auditable project history without messy merge commits.

Git cherry-pick applies a specific commit from one branch to another by extracting the diff introduced in that commit. You identify the target commit hash and execute the cherry-pick command to apply those isolated changes to your current working branch.

To resolve conflicts during rebase or cherry-pick, you manually fix the conflicting files in your working directory. After editing, stage the resolved files and continue the workflow to proceed with applying the remaining commits in the sequence.

You should avoid rewriting git history with rebase on commits that have already been pushed to a shared remote repository. Altering shared history causes divergent timelines for collaborators, leading to severe merge conflicts and lost work when they attempt to synchronize.