From 960155f060008549ee315c4253721205fe0cf195 Mon Sep 17 00:00:00 2001 From: shivankursharma018 Date: Fri, 6 Nov 2026 20:47:33 +0530 Subject: [PATCH 1/2] update git workflow diagram --- git/intermediate_git/using_git_in_the_real_world.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/git/intermediate_git/using_git_in_the_real_world.md b/git/intermediate_git/using_git_in_the_real_world.md index 3ebfb82d446..85a2a6bbda8 100644 --- a/git/intermediate_git/using_git_in_the_real_world.md +++ b/git/intermediate_git/using_git_in_the_real_world.md @@ -24,11 +24,12 @@ Here is a visual representation of the workflow with Git and GitHub that illustr 
 
 graph TD;
-    A[Upstream Repository: TheOdinProject/curriculum] -->|git fetch upstream/main| B[Local Repository: main];
-    B -->|git checkout your_branch_name| C[Local Repository: your_branch_name];
-    C -->|git push origin your_branch_name| D[Your Fork on GitHub];
-    D -->|Create Pull Request to Upstream| E[Pull Request on GitHub];
-    E -->|Maintainers Merge PR to Upstream| A[Upstream Repository: TheOdinProject/curriculum];
+    A[Upstream Repository: TheOdinProject/curriculum] -->|git fetch upstream| B[Local Repository: refs updated];
+    B -->|git checkout main
git merge upstream/main| C[Local Repository: main updated];
+    C -->|git checkout your_branch_name
git merge main| D[Local Repository: your_branch_name updated];
+    D -->|git push origin your_branch_name| E[Your Fork on GitHub];
+    E -->|Create Pull Request to Upstream| F[Pull Request on GitHub];
+    F -->|Maintainers Merge PR to Upstream| A[Upstream Repository: TheOdinProject/curriculum];
From 8de8741c3e3c0a1f08cc0d918c1752b9b28ed29e Mon Sep 17 00:00:00 2001 From: shivankursharma018 Date: Sat, 7 Nov 2026 17:31:01 +0530 Subject: [PATCH 2/2] markdown linter resolved --- git/intermediate_git/using_git_in_the_real_world.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git/intermediate_git/using_git_in_the_real_world.md b/git/intermediate_git/using_git_in_the_real_world.md index 85a2a6bbda8..e89f6334389 100644 --- a/git/intermediate_git/using_git_in_the_real_world.md +++ b/git/intermediate_git/using_git_in_the_real_world.md @@ -25,8 +25,10 @@ Here is a visual representation of the workflow with Git and GitHub that illustr graph TD; A[Upstream Repository: TheOdinProject/curriculum] -->|git fetch upstream| B[Local Repository: refs updated]; - B -->|git checkout main
git merge upstream/main| C[Local Repository: main updated]; - C -->|git checkout your_branch_name
git merge main| D[Local Repository: your_branch_name updated]; + B -->|"`git checkout main + git merge upstream/main`"| C[Local Repository: main updated]; + C -->|"`git checkout your_branch_name + git merge main`"| D[Local Repository: your_branch_name updated]; D -->|git push origin your_branch_name| E[Your Fork on GitHub]; E -->|Create Pull Request to Upstream| F[Pull Request on GitHub]; F -->|Maintainers Merge PR to Upstream| A[Upstream Repository: TheOdinProject/curriculum];