Question
Drawing on Darcs, the version control system Jujutsu treats these issues as first-class objects. For 10 points each:
[10h] Name these issues that result from ambiguous requests to merge diverged branches. Index files surround the text that causes these issues with repeated inequality symbols.
ANSWER: merge conflicts [or edit conflicts]
[10e] Linus Torvalds developed this predominant version control system, which has a three-letter name. "[this system]-Hub" is a code-sharing website represented by Octocat.
ANSWER: Git [or GitHub.com]
[10m] Resolving merge conflicts can involve this command, which typically follows "git add" and precedes "git push." Like "git branch," this command uses the "dash-m" flag to supplement a message.
ANSWER: commit [or git commit or commits]
<Science - Other Science - Computer Science>
Data
| Team | Opponent | Part 1 | Part 2 | Part 3 | Total |
|---|---|---|---|---|---|
| Northmont | Thomas Jefferson B | 0 | 10 | 0 | 10 |
| Northside College Prep | Russell | 0 | 10 | 10 | 20 |
| Uni School of Nashville A | Centennial B | 0 | 10 | 0 | 10 |
| Uni of Illinois Laboratory | Adlai E. Stevenson B | 0 | 10 | 0 | 10 |
Summary
| Tournament | Edition | Exact Match? | Heard | PPB | Easy % | Medium % | Hard % |
|---|---|---|---|---|---|---|---|
| 2025 PACE NSC | 06/07/2025 | Y | 4 | 12.50 | 100% | 25% | 0% |