The Accidental Stage

📁 Files

secrets.envS

src/app.jsS

! ConflictS StagedM ModifiedU Untracked

+src/app.js+ console.log('app')

+secrets.env+ API_KEY=supersecret123

📊 Commit Graphcurrent branchmain

📐 Rebase AcademyAdvanced0/4

📖 Concepts

RebaseRe-applies commits from your current branch on top of another branch. Creates a linear history instead of a merge commit.

Linear HistoryA commit graph with no branching/merging — every commit has one parent. Easier to read and bisect.

Rebase vs MergeMerge preserves the full branch structure. Rebase rewrites commits for a cleaner, linear history. Both produce the same final content.

Understand the situation

Feature branch started from the same base as main, but has different commits. Check the log to see.

● Understand the situation

○ Rebase feature onto main

○ Check the linear history

○ Merge feature into main (fast-forward)

🧩 The Accidental StageUnsolved

📖 Story

You ran git add . and accidentally staged secrets.env along with your real changes. The file contains API keys — it must NOT be committed. Remove it from the staging area but keep it on disk.

Goal

Solve the problem by using the correct Git commands.

Terminal

🧩 Problem: The Accidental Stage

You staged a file you didn't mean to. Remove it from the staging area without losing your changes.

Use the terminal to solve the problem. Results are checked automatically.