📁 Files
No files yet. Create one!
! ConflictS StagedM ModifiedU Untracked
No files staged. Use
git add to stage changes.📊 Commit Graphcurrent branchmain
GitorGit%20rotate(-45%2029%2029)'%20d='M5,58c-2.76142,0%20-5,-2.23858%20-5,-5v-48c0,-2.76142%202.23858,-5%205,-5h33v12.54404c-2.06553,0.94801%20-3.5,3.03446%20-3.5,5.45596c0,0.73514%200.13221,1.43941%200.37415,2.09031l-15.28384,15.28384c-0.6509,-0.24194%20-1.35517,-0.37415%20-2.09031,-0.37415c-3.31371,0%20-6,2.68629%20-6,6c0,3.31371%202.68629,6%206,6c3.31371,0%206,-2.68629%206,-6c0,-0.73514%20-0.13221,-1.43941%20-0.37415,-2.09031l14.87415,-14.87415l0,11.50851c-2.06553,0.94801%20-3.5,3.03446%20-3.5,5.45596c0,3.31371%202.68629,6%206,6c3.31371,0%206,-2.68629%206,-6c0,-2.42149%20-1.43447,-4.50795%20-3.5,-5.45596l0,-12.08808c2.06553,-0.94801%203.5,-3.03446%203.5,-5.45596c0,-2.42149%20-1.43447,-4.50795%20-3.5,-5.45596l0,-12.54404h10c2.76142,0%205,2.23858%205,5v48c0,2.76142%20-2.23858,5%20-5,5z'/%3e%3c/svg%3e)
🏷️ Release Branch WorkflowAdvanced0/11
📖 Concepts
Release branchA branch that stabilizes a specific version. You branch from a known-good commit before risky features landed. Only critical bug fixes are cherry-picked in.
Cherry-pick into releaseNew features on main are too risky for a release. Use
git cherry-pick <hash> to pick only the specific bug fix commits, ignoring later feature commits.Push branch and tagAfter tagging, push both the branch (
git push origin release/v1.0) and the tag (git push origin v1.0.0). Tags are not pushed automatically with branches.📖 Story
Your team has been busy: 2 new features (dashboard, API refactor) and a critical bug fix were pushed to origin/main. You need to ship v1.0 with the bug fix but WITHOUT the unfinished features.
You'll create a release branch from the last stable commit (before the fix and features), cherry-pick only the fix, tag the release, and push both the branch and the tag.
Then you'll sync main, merge the fix back, and push cleanly.
This is the standard release branch workflow used to stabilize a version without blocking ongoing development.
View the current state
Run
git log --oneline. Main has 3 commits. The remote has 3 more: a bug fix (r4d5e6f) and two risky features (dashboard, API refactor). We need only the fix for the release.● View the current state
○ Fetch the remote commits
○ Branch from the stable commit
○ Cherry-pick only the bug fix
○ Tag the release
○ Push the release branch
○ Push the tag
○ Switch back to main
○ Pull the latest main
○ Merge the release fix into main
○ Push main
🧩 The Lost CommitUnsolved
📖 Story
In a moment of panic you ran
git reset --hard HEAD~1 to undo your last commit. Then you realized that commit had two hours of work in it.
The commit is gone from git log but Git never truly deletes commits — they live in the reflog for 90 days.
Find the lost commit hash in the reflog and restore it.Goal
Solve the problem by using the correct Git commands.
Terminal
🧩 Problem: The Lost Commit
You ran git reset --hard and lost a commit. Recover it using the reflog.
Use the terminal to solve the problem. Results are checked automatically.