branch-merge

First verify the target branch is clean with git status and up to date with git pull. Then run git checkout on the target branch and git merge origin/<source> --no-ff with a descriptive commit message to preserve branch history.

Use git cherry-pick <commit-hash> --no-commit to stage the changes without committing, review them, then commit with a descriptive message. This is useful when you only need specific commits rather than a full branch merge.

A full merge with --no-ff preserves the complete branch history. A squash merge with git merge --squash flattens all branch commits into one. Cherry-pick applies only selected individual commits to the target branch.

Do not manually merge lockfiles. After resolving package.json conflicts, run yarn install to regenerate the yarn.lock file automatically, which produces a consistent dependency resolution.

Conflicts often occur between the old extraReducers map syntax and the newer builder callback pattern. Always convert to the builder pattern using builder.addCase, and watch for undefined thunks which crash when passed to addCase.