1 / 5
Before starting a new feature, you make a new line of development off main. You ___ a branch.
-
-
-
-
You
cut or
create a branch.
- cut a branch / create a branch — start a new branch
- "Fork" usually means copying a whole repo, not a branch within one
"Split" and "peel" are not standard. Example:
"Cut a feature branch off develop and we'll review it there."
2 / 5
Your feature is done and you want to bring it into main, integrating both histories. You ___ the branch.
-
-
-
-
Merge a branch is the standard term for combining one branch's changes into another.
- merge a branch / a PR — integrate the changes
- An alternative is to rebase, which replays your commits on top of another branch for a linear history
"Blend"/"fuse" are not used in Git. Example:
"Once approved, merge it into main."
3 / 5
Two people edited the same lines. Git can't auto-merge, so you must ___ the conflicts.
-
-
-
-
Resolve conflicts is the fixed collocation for manually fixing merge conflicts.
- resolve a conflict / merge conflicts
- You can also fix conflicts, but "resolve" is the technical default
"Solve out" and "settle down" are wrong here. Example:
"There were conflicts in the config file, so I resolved them by hand."
4 / 5
You want just one specific commit from another branch, not the whole branch. You ___ it.
-
-
-
-
Cherry-pick means applying a single specific commit from one branch onto another.
- cherry-pick a commit — copy one chosen commit across
- Useful for hotfixes you want in a release branch without merging everything
The other options are invented. Example:
"Cherry-pick that bugfix commit onto the 2.1 release branch."
5 / 5
Your branch has ten messy commits. Before merging, you combine them into one clean commit. You ___ the commits.
-
-
-
-
Squash commits means combining multiple commits into a single one, usually for a tidy history.
- squash commits — often via squash and merge
- Keeps the main branch history clean and reviewable
"Crush" and "flatten out" are not Git terms. Example:
"Squash those WIP commits before you open the PR."