Project Overview
Part of the Version Control section of Coddy's Terminal journey — lesson 50 of 58.
Time for a realistic feature-branch workflow. The project is a tiny todo list with two files: todo.txt (the list) and readme.md (the docs).
Across this chapter you will:
- Set up the repo with a clean initial commit on
main. - Create a
add-taskbranch and add a new todo item there.
- Update the
readme.mdonmainindependently. - Merge the feature branch into
main. - Verify the final state.
This is the same shape as a typical pull-request workflow on GitHub, just without the network round-trip.
Challenge
BeginnerList the files in the starting folder using ls. The expected output is alphabetical.
Cheat sheet
Typical feature-branch workflow steps:
- Set up repo with initial commit on
main - Create a feature branch and make changes
- Make independent changes on
main - Merge the feature branch into
main - Verify the final state
Try it yourself
Terminal
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