Skip to content

Commit d8dc965

Browse files
committed
feat: Update Tips And Tricks
Signed-off-by: https://github.com/Someshdiwan <[email protected]>
1 parent 8446e6d commit d8dc965

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

Tips And Tricks/git.txt renamed to Tips And Tricks/Git.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
Nice — here’s the commit graph diagram you asked for. This shows how your history looks depending on whether you merge or rebase.
2-
3-
4-
51
A) Merge workflow (preserves full branch graph)
62

73
Upstream main: A──B──C───────────────┐
@@ -82,5 +78,3 @@ So: Merge = “historical diary” (records exactly what happened).
8278
Rebase = “rewrite the story” (makes it look like you developed cleanly on top).
8379

8480
85-
86-
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?

Tips And Tricks/Github.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
Perfect — here’s a visual ASCII diagram showing how forks, remotes, branches, and PRs fit together. This is the “map in your head” for push/pull/rebase.
2-
3-
4-
51
GitHub Fork Workflow — Visual Map
62

73
┌─────────────────────────────────────────┐
@@ -79,9 +75,3 @@ git push origin feature-branch --force-with-lease
7975

8076

8177
82-
83-
👉 This diagram shows the two “worlds”: your fork (origin) and the official repo (upstream). Your feature-branch is only in your fork until you open a PR. After merge, the changes live in upstream’s main.
84-
85-
86-
87-
Would you like me to also show a commit graph diagram (with merge vs rebase paths) so you can see how history looks in both cases?

Tips And Tricks/GithubWorking.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
Yes, we can definitely turn this into a clean anonymous one-page GitHub/Git workflow cheat sheet — no JetBrains, no school references, just the structure + universal commands.
2-
3-
Here’s a refined version:
4-
5-
6-
7-
GitHub/Git Pro Workflow Cheat Sheet
8-
9-
10-
111
1) GitHub Hierarchy
122

133
GitHub (service)
@@ -125,7 +115,3 @@ Fork repo → Clone → Create branch → Commit → Push → Open PR
125115

126116

127117
128-
129-
This way, you’ve got the hierarchy, commands, and etiquette in one page.
130-
131-
Would you like me to make a visual ASCII diagram of remotes/branches (origin vs upstream, main vs feature branch) so you can instantly see where push/pull/rebase happen?

0 commit comments

Comments
 (0)