GIT · History · 10 min

Combine the unfinished checkpoints

Replace three local WIP commits with one coherent change.

Not completed

Your task

Combine the latest three commits into one with subject Complete release notes. Preserve the final release.txt contents and the initial commit.

What you’re aiming for

There are two commits total.
The final subject and release contents are correct.

1. Prepare your practice folder

Use Git 2.28 or newer. The setup commands below use a Bash-compatible shell: Git Bash on Windows, or Bash on Linux/macOS.

Create a new, empty folder for this exercise. If that name already exists, choose another new name. Continue only after you’re inside the new folder.

NEW PRACTICE FOLDER

mkdir opsrung-git-squash-work-in-progress && cd opsrung-git-squash-work-in-progress

Run these setup commands in that folder:

SETUP — RUN ONCE

git init --initial-branch=main
git config --local user.name 'Practice Learner'
git config --local user.email 'practice@example.invalid'
printf '%s\n' 'A disposable OpsRung practice repository.' > README.txt
git add -- README.txt
git commit -m 'Start practice'
printf '%s\n' 'Draft.' > release.txt
git add -- release.txt
git commit -m 'WIP 1'
printf '%s\n' 'Reviewed draft.' > release.txt
git add -- release.txt
git commit -m 'WIP 2'
printf '%s\n' 'Reviewed and approved.' > release.txt
git add -- release.txt
git commit -m 'WIP 3'

Only if your personal Git settings interfere

You can normally skip this. If a commit asks for a signing key, runs a custom hook, or changes line endings unexpectedly, these repository-local overrides keep this disposable exercise independent of those settings.

OPTIONAL REPOSITORY OVERRIDES

git config --local commit.gpgsign false
git config --local core.autocrlf false
git config --local core.hooksPath .git/practice-no-hooks

Retry the failed command afterward. These settings apply only inside this practice repository.

2. Try the task

Work toward the goal above. Start by inspecting the files or resources, then use a hint if you need one.

Hint 1

A soft reset moves the branch while keeping its changes staged.

Hint 2

Move back exactly three commits in this fixture.

Hint 3

Create one new commit from the staged final state.

3. Review your result

Use these commands to look at your result and compare it with the goals. The website does not run or verify them.

REVIEW IN YOUR TERMINAL

git status
git log --oneline --graph --all -12

What you should see

There are two commits total.
The final subject and release contents are correct.

If your result differs: Work only in this exercise’s repository. Compare the branch, files, and history with every goal before marking complete.

Compare with one possible solution

ONE POSSIBLE SOLUTION — BASH

git reset --soft HEAD~3
git commit -m 'Complete release notes'

Other approaches are fine if you reach the same goal. Opening this solution does not mark the exercise complete.

Finished this exercise?

You decide when you’re done. Your choice is saved in this browser, and you can change it later.