問題文
Suppose a file in a work area comes back with knots after a pull. When does the short menu suffice, and when is the dedicated editor the better road?
選択肢
- The short menu suffices where a file holds a note or a hint written by a reviewer, and the dedicated editor is better where a part has to be given up or the records are kept apart
- The short menu suffices where a file holds a name or a path taken by another branch, and the dedicated editor is better where a theme has to be applied or the sheet is trimmed down
- The short menu suffices where a file holds a mark or a stamp left by a review, and the dedicated editor is better where a build has to be green or the tests are set going again
- The short menu suffices where a file holds a few plain clashes settled by keeping one side or the other, and the dedicated editor is better where both sides are wanted or the clashes run long