1 / 5
Fill in: 'Git will ___ a conflict when two branches change the same lines.'
-
-
-
-
We say Git 'flags a conflict' — the standard collocation for it being surfaced to the user. The other options aren't idiomatic here.
2 / 5
Fill in: 'We ___ each conflicting hunk carefully before committing the merge.'
-
-
-
-
We 'resolve a conflict' — the standard, precise Git collocation. The other options are less idiomatic in this technical context.
3 / 5
Fill in: 'Frequent rebasing helps us ___ conflicts before they pile up.'
-
-
-
-
We 'avoid conflicts' — the standard collocation for preventing them. The other options aren't idiomatic phrasal forms here.
4 / 5
Fill in: 'After resolving, we ___ the merge to confirm nothing was lost.'
-
-
-
-
We 'verify the merge' — the standard collocation for confirming correctness. The other options are less idiomatic here.
5 / 5
Fill in: 'Long-lived branches tend to ___ conflicts that are hard to untangle.'
-
-
-
-
We 'accumulate conflicts' — the standard collocation for them building up over time. The other options aren't idiomatic here.