Recap - Merge Master
Part of the Version Control section of Coddy's Terminal journey — lesson 39 of 58.
Challenge
MediumThe folder contains menu.txt and about.txt, both with one line each.
Walk through this scenario:
- Initialize the repo, configure user, and create the first commit with both files.
- On a branch
menu-update, appendburgerstomenu.txtand commit with messageAdd burgers. - Back on
main, appendcontact infotoabout.txtand commit with messageAdd contact info. - Merge
menu-updateintomainwith the merge messageMerge menu update. - Print the contents of both files (menu first, then about), concatenated by
cat menu.txt about.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