Menu
Coddy logo textTech

Branch Dance

Part of the Version Control section of Coddy's Terminal journey — lesson 57 of 58.

challenge icon

Challenge

Medium

The folder contains menu.txt with content pasta. Run this branching ritual:

  1. Initialize the repo on main, configure user (Branch Dancer / dance@coddy.tech), stage and commit menu.txt with the message Initial menu.
  2. Create and switch to a branch specials. Append tacos to menu.txt, commit with message Add tacos.
  3. Switch back to main. Append burgers to menu.txt, commit with message Add burgers.
  4. Merge specials into main. The merge will conflict. Resolve it by overwriting menu.txt with these three lines: pasta, burgers, tacos. Stage the file and finalize the merge with message Combine menu.

Print the final contents of menu.txt.

Try it yourself

Terminal

All lessons in Version Control