G9I committed to the wrong branch
You made a commit on main that belongs on feature/discounts, and you have not pushed it yet.
Move "Apply discounts" to feature/discounts and take it off main.
Learn Git by doing
Fix everyday Git problems in an interactive repository. Try the commands, see the graph change, and continue with the guide and video.
Try it in your browser
Choose a lesson or explore freely. Run the suggested Git commands and watch the repository change.
Practice uses a simulated repository in your browser memory. It does not access your files or connect to a real remote repository.
Explore a small repository without a set goal. Try supported commands and see what changes when a teammate pushes.
This simulator supports a subset of Git commands. Unsupported commands explain their limits in the terminal.
G9Fix the last commit: the message, a forgotten file
Your last commit says "Add stylsheet" and left style.css out. You have not pushed it yet.
Replace the last commit with one that has style.css and the message "Add stylesheet", then push it.
G5Undo a commit, before and after pushing
Your last commit should not exist. One is only on your machine; an older one is already pushed.
Undo the local commit, then undo the pushed one without rewriting shared history.
G8aRevert a git reset --hard
You ran git reset --hard HEAD~2 and two commits disappeared.
Find the lost commits and bring main back to them.
Resolve a merge conflict
main and feature/title both changed the same line of index.html.
Merge feature/title into main and keep a title you choose.
G10Detached HEAD: keep your work
You checked out an old commit, made a commit there, and Git says "HEAD detached".
Put your commit on a branch so it cannot get lost.
G11Your branch and origin have diverged
You committed while a teammate pushed. Now git status says your branch and origin/main have diverged.
Bring in your teammate's commit, keep yours on top, and push.
G12Switch branches with unfinished work
You are halfway through a change on main and need to fix something on the hotfix branch now.
Put your work aside, make the fix on hotfix, come back and get your work back.
G8bRecover a deleted Git branch
You deleted feature/search with git branch -D, and it had a commit nobody else has.
Get feature/search back with its commit.
Git School · G6
Try it in your browser
main and feature/title both changed the same line of index.html.
Goal: Merge feature/title into main and keep a title you choose.
Practice uses a simulated repository in your browser memory. It does not access your files or connect to a real remote repository.
Commands to practise
This simulator supports a subset of Git commands. Unsupported commands explain their limits in the terminal.
git merge feature/title
cat index.html
echo "<h1>Our Best Shop</h1>" > index.html
git add index.html
git commit --no-editWith FluxGit
- Before you merge, the Operation Plan predicts the conflict on your real branches.
- The three-way editor shows both sides and the result; Mark as resolved, and Undo this merge if you change your mind.
Related lessons
Watch: commit the fix and leave the debug print unstaged
Follow two edits in one file: stage the fix, inspect the staged change, and commit it while the debug print stays in the working tree. The narration also explains the equivalent intent with git add -p.
Read the guideWatch the tutorial
Git worktree vs submodule: which one, and when
Worktree or submodule? They solve different problems. A worktree is a second working folder of the same repository. A submodule is another repository, pinned inside yours.
Read the guideWatch the tutorialWith FluxGit
Fix everyday Git problems in an interactive repository. Try the commands, see the graph change, and continue with the guide and video.
Download FluxGit