📁 Files

README.md

y.py

! ConflictS StagedM ModifiedU Untracked

No files staged. Use git add to stage changes.

📊 Commit Graphcurrent branchmain

🔄 Pull --rebaseAdvanced0/3

📖 Concepts

Divergent HistoryWhen your local branch and the remote branch have both made commits based on a common ancestor, they have diverged.

Pull --rebaseFetches remote changes and replays your local commits on top of them — instead of creating a merge commit. Keeps history linear.

Merge CommitA commit with two parents created by git merge. It records that two lines of development were combined.

Check the diverged history

Both local and remote have commits based on the same ancestor. They diverged.

● Check the diverged history

○ Pull with rebase

○ Verify the linear history

Terminal

📘 Starting tutorial: Pull --rebase

Use git pull --rebase to keep a linear history when pulling remote changes

Step 1: Check the diverged history