git-advanced

Rebasing rewrites your branch history on top of dev, creating a linear commit sequence. Run `git rebase dev` on your feature branch, resolve any conflicts, then push with `git push --force-with-lease` to update the remote without overwriting others' work.

Git bisect automates binary search through your commit history to isolate the breaking change. Run `git bisect start`, mark a known-bad and known-good commit, then test each midpoint until bisect identifies the exact commit that caused the bug.

Cherry-pick selectively applies individual commits to your current branch without merging the entire source branch. Use `git cherry-pick <commit-hash>` to copy a commit, or cherry-pick a range to apply multiple commits in sequence to a different branch.

Merge conflicts during rebase occur when changes overlap. Edit conflicted files to remove conflict markers, stage the resolved files with `git add`, then continue the rebase with `git rebase --continue` until all conflicts are resolved.

Git reflog tracks all branch movements, including failed rebases. Use `git reflog` to find the previous state, then `git reset --hard <ref>` to recover your branch. Force-with-lease prevents accidental overwrites of shared commits on protected branches.

Rebase-first maintains linear history, making bisect searches faster and logs easier to read. Merge commits create branches in history that obscure the sequence of changes; a linear history with rebased feature branches preserves a clean, traceable development timeline.