To integrate the latest changes from main, the developer will ___ their feature branch instead of merging.
To rebase a branch means to replay its commits on top of another branch, rewriting history for a linear commit graph. Rebase is the precise Git term, as in "git rebase main" and "rebase workflow." Move, pull over, and shift onto are informal and not the standard Git phrase. Engineers say "rebase the feature branch before merging," so rebase the branch is the correct collocation for the operation that rewrites commit history to apply changes on top of the latest upstream commits.
2 / 5
Before creating the pull request, the developer will ___ the six fix commits into one clean commit.
To squash commits means to combine multiple commits into a single one, typically done with git rebase -i. Squash is the precise Git term, behind "squash and merge" in GitHub pull requests. Combine up, merge down, and pack in are not the standard Git collocations. Developers say "squash the commits before merging," so squash commits is the correct collocation for collapsing multiple commits into one for a cleaner history.
3 / 5
The developer needs to ___ just one specific bug-fix commit from the release branch into main.
To cherry-pick a commit means to apply a specific commit from another branch without merging the entire branch. Cherry-pick is the precise Git term, as in git cherry-pick <SHA>. Pick up, grab out, and pull across are informal. Engineers say "cherry-pick the hotfix commit into the release branch," so cherry-pick a commit is the correct collocation for selectively applying a single commit across branches.
4 / 5
Once testing is complete, the team will ___ the release to mark the exact commit that shipped to production.
To tag a release means to create a named Git tag (e.g., v2.1.0) that points to a specific commit. Tag is the precise Git term, as in git tag v2.1.0 and "semantic versioning tags." Stamp, mark up, and label out are not real Git collocations. Engineers "tag the release commit so it is easy to find later," so tag the release is the correct collocation for recording a named, addressable reference to a specific version of the codebase.
5 / 5
After a thorough review, the team lead will ___ the pull request to bring the changes into main.
To merge a pull request means to integrate its changes into the target branch. Merge is the foundational Git term, as in "git merge" and the "Merge" button in GitHub and GitLab. Accept in, pull through, and bring in are informal and not standard GitHub vocabulary. Engineers say "merge the PR once the review is approved," so merge the pull request is the correct collocation for the action of integrating reviewed changes into the main codebase.