Practise the standard verbs for keeping a feature branch clean and mergeable.
0 / 5 completed
1 / 5
Fill in: 'We ___ a feature branch onto main regularly so the eventual merge stays small and manageable.'
We 'rebase a branch' — the standard, established Git collocation for replaying commits on a new base. The other options aren't the recognised term here.
2 / 5
Fill in: 'A long-lived branch that never syncs with main can ___ a painful wall of conflicts at merge time.'
We say a stale branch will 'create' conflicts — the standard, simple collocation for the resulting problem. The other options aren't idiomatic here.
3 / 5
Fill in: 'We ___ conflicting hunks carefully during a rebase instead of blindly accepting one side.'
We 'resolve conflicts' — the standard, established Git collocation for reconciling diverging changes. The other options aren't the recognised term here.
4 / 5
Fill in: 'We ___ a force-push only to our own feature branch, never to a shared one others depend on.'
We 'restrict' an action — the standard collocation for limiting where a risky operation is allowed. The other options aren't idiomatic here.
5 / 5
Fill in: 'We ___ commit history after a rebase so the log still tells a coherent story of the change.'
We 'clean up' history — the standard, established collocation for squashing and reordering commits before review. The other options aren't the recognised term here.