フリー問題

問題文

A maintainer keeps one line where each new capability is developed separately, and another line opened shortly before shipping where only fixes are accepted. How is each of these lines named?

選択肢

1. The line for new capability is the integration branch, and the line opened before shipping is the release branch.
2. The line for new capability is the feature branch, and the line opened before shipping is the reverted commit.
3. The line for new capability is the integration branch, and the line opened before shipping is the reverted commit.
4. The line for new capability is the feature branch, and the line opened before shipping is the release branch.