Merge The Feature
Part of the Version Control section of Coddy's Terminal journey — lesson 54 of 58.
Both branches now have new commits. Time to bring them together. You are on
main, so merging add-task creates a clean three-way merge: the two branches touched different files, so there will be no conflict.
Challenge
EasyMerge add-task into main with the message Merge add-task. Print the contents of todo.txt followed by readme.md using cat todo.txt readme.md.
Cheat sheet
To merge a branch into the current branch with a custom message:
git merge <branch> -m "Merge message"When two branches modify different files, Git performs a three-way merge with no conflicts.
Try it yourself
Terminal
git init -q -b main
git config user.name "Todo Dev"
git config user.email "todo@coddy.tech"
git add .
git commit -q -m "Seed todo list"
git switch -q -c add-task
echo "walk the dog" >> todo.txt
git add todo.txt
git commit -q -m "Add walk task"
git switch -q main
echo "This is the project readme." >> readme.md
git add readme.md
git commit -q -m "Expand readme"
cat readme.md
Test yourselfThis lesson includes a short quiz. Start the lesson to answer it and track your progress.
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 Main
Work On A BranchUpdate Main In ParallelMerge The FeatureClean Up3Tracking Changes
The Staging AreaGit AddGit CommitModifying A Tracked FileGit LogRecap - First Commits6Recipe Site Project
Project OverviewInitialize And IgnoreFirst CommitAdd A Second RecipeInspect The History