Skip to content

docs: Add cleaned-up Git merge vs rebase guide with commit graphs #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CodeCrafterX7 wants to merge 3 commits into from
Closed

docs: Add cleaned-up Git merge vs rebase guide with commit graphs #9

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4742e3
feat: Documentation updated.
Someshdiwan Sep 30, 2025
a032315
feat: Documentation updated merge or rebase Git.
Someshdiwan Oct 1, 2025
7c48328
docs(JAR): explain what a JAR file is with examples
Someshdiwan Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions Tips And Tricks/git.txt → Tips And Tricks/Git merge or rebase.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Nice — here’s the commit graph diagram you asked for. This shows how your history looks depending on whether you merge or rebase.
This shows how your history looks depending on whether you merge or rebase.

⸻

Expand All @@ -10,11 +10,11 @@ Your branch: A──B──C──D──E─────────┴─M
↑
Merge commit (M)

• You branched from commit C.
• You added commits D and E.
• Upstream added commits after C.
• When you git merge upstream/main, Git creates a merge commit (M) joining both histories.
• History shows branching + merging — good for context but can look messy.
• You branched from commit C.
• You added commits D and E.
• Upstream added commits after C.
• When you git merge upstream/main, Git creates a merge commit (M) joining both histories.
• History shows branching + merging — good for context but can look messy.

⸻

Expand Down Expand Up @@ -47,14 +47,14 @@ A──B──C──F──G──H──D'──E'
⸻

D) When to use what
• Merge →
• If you want to preserve the “real” history (showing when branches diverged).
• Safer for beginners (no rewriting commits).
• Good for long-lived feature branches.
• Rebase →
• If you want a clean, straight line history.
• Preferred in open-source PR workflows.
• Requires confidence resolving conflicts & force-pushing.
• Merge →
• If you want to preserve the “real” history (showing when branches diverged).
• Safer for beginners (no rewriting commits).
• Good for long-lived feature branches.
• Rebase →
• If you want a clean, straight line history.
• Preferred in open-source PR workflows.
• Requires confidence resolving conflicts & force-pushing.

⸻

Expand All @@ -75,12 +75,9 @@ git rebase upstream/main
# fix conflicts if needed
git push origin feature-branch --force-with-lease


⸻

So: Merge = “historical diary” (records exactly what happened).
Rebase = “rewrite the story” (makes it look like you developed cleanly on top).

⸻

Want me to also sketch a real-life example with commit hashes (like abc123, def456) so you can see how git log looks different between merge and rebase?