Branch Dance
Part of the Version Control section of Coddy's Terminal journey — lesson 57 of 58.
Challenge
MediumThe folder contains menu.txt with content pasta. Run this branching ritual:
- Initialize the repo on
main, configure user (Branch Dancer/dance@coddy.tech), stage and commitmenu.txtwith the messageInitial menu. - Create and switch to a branch
specials. Appendtacostomenu.txt, commit with messageAdd tacos. - Switch back to
main. Appendburgerstomenu.txt, commit with messageAdd burgers. - Merge
specialsintomain. The merge will conflict. Resolve it by overwritingmenu.txtwith these three lines:pasta,burgers,tacos. Stage the file and finalize the merge with messageCombine menu.
Print the final contents of menu.txt.
Try it yourself
Terminal
All lessons in Version Control
2Getting Started
Initialize A RepositoryThe .git FolderConfigure Your IdentityGit StatusRecap - First Repo8Merging
What Is A MergeFast-Forward MergeThree-Way MergeMerge ConflictsResolve A ConflictRecap - Merge Master11Feature Branch Project
Project OverviewInitialize Main3Tracking Changes
The Staging AreaGit AddGit CommitModifying A Tracked FileGit LogRecap - First Commits6Recipe Site Project
Project OverviewInitialize And Ignore