Skip to content
TerminalA conflict
Git

A conflict

Merge tr into main. Both changed the same line of greeting.txt: resolve the conflict keeping both greetings (main's first) and finish the merge.
  • tr is merged into main
  • No conflict markers are left
  • greeting.txt has both greetings
  • The working tree is clean

The reference takes 5 commands: finish in that many, without hints, for three stars.

Files

    My submissions