From 25fe8973ef5211f3b8c048fbb889369c71400d60 Mon Sep 17 00:00:00 2001 From: Sander van Rijn Date: Tue, 17 Sep 2024 08:28:59 +0200 Subject: [PATCH 1/4] remove checkout references from episode 14 diagram --- _episodes/14-collaboration-using-git.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_episodes/14-collaboration-using-git.md b/_episodes/14-collaboration-using-git.md index 4807c9581..fc33046a8 100644 --- a/_episodes/14-collaboration-using-git.md +++ b/_episodes/14-collaboration-using-git.md @@ -105,15 +105,15 @@ sequenceDiagram Staging Area->>+Local Repository: git commit Local Repository->>+Remote Repository: git push Remote Repository->>+Local Repository: git fetch - Local Repository->>+Working Directory:git checkout + Local Repository->>+Working Directory:git restore Local Repository->>+Working Directory:git merge - Remote Repository->>+Working Directory: git pull (shortcut for git fetch followed by git checkout/merge) + Remote Repository->>+Working Directory: git pull (shortcut for git fetch followed by git merge) --> -![Development lifecycle with Git, containing Git commands add, commit, push, fetch, checkout, merge and pull](../fig/git-lifecycle.svg){: .image-with-shadow width="600px"} +![Development lifecycle with Git, containing Git commands add, commit, push, fetch, restore, merge and pull](../fig/git-lifecycle.svg){: .image-with-shadow width="600px"}

Software development lifecycle with Git

From 3802e810b7a4d8d12d23b0093577fd93c5922b9c Mon Sep 17 00:00:00 2001 From: Aleksandra Nenadic Date: Thu, 3 Oct 2024 12:03:08 +0100 Subject: [PATCH 2/4] Fix for checkout command in the diagram --- _episodes/14-collaboration-using-git.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/_episodes/14-collaboration-using-git.md b/_episodes/14-collaboration-using-git.md index fc33046a8..e065c47c0 100644 --- a/_episodes/14-collaboration-using-git.md +++ b/_episodes/14-collaboration-using-git.md @@ -57,9 +57,8 @@ Git has several important characteristics: so even if you make a mistake you can revert to a point before it. The diagram below shows a typical software development lifecycle with Git -(starting from making changes locally) and the commonly used commands to interact -with different parts of the Git infrastructure, -such as: +(in our case starting from making changes in a local branch that "tracks" a remote branch) and the commonly used commands to interact +with different parts of the Git infrastructure, including: - **working directory** - a local directory (including any subdirectories) where your project files live and where you are currently working. @@ -102,16 +101,15 @@ such as: Created with https://mermaid.live/edit#pako:eNqVkjFrwzAQhf-KuKmlKd01BAoZ2yUZumi5SmdbRPI58oliQv57JbuloSaFajqd3sd7x-kMlh2BhpFOmXpLO49twmh6Vc4bp6PvW7Xziaxwmh6324eDYFubz4lQq9aLQucW_fVTlb6wxaD2NPDoK77ILcfoZSF-Kyq1p8hCK2zIY7dAK8Ftr4bEdretVgPqOWBH9shZ_stFSi39EXFNfQ0WgrobO05ic4nM6Sd6uYXAH-TU-6Susz3NZvewgVJE9K7s8Fy9DUhHkQzoUjpqMAcxYPpLkWIWPky9BS0p0wby4FC-Vw66wTCWLrma-HX5F_P3uHwCS-vA3Q sequenceDiagram Working Directory->>+Staging Area: git add - Staging Area->>+Local Repository: git commit - Local Repository->>+Remote Repository: git push - Remote Repository->>+Local Repository: git fetch - Local Repository->>+Working Directory:git restore - Local Repository->>+Working Directory:git merge - Remote Repository->>+Working Directory: git pull (shortcut for git fetch followed by git merge) + Staging Area->>+Local Repository Branch: git commit + Local Repository Branch->>+Remote Repository Branch: git push + Remote Repository Branch->>+Local Repository Branch: git fetch + Local Repository Branch->>+Working Directory:git merge + Remote Repository Branch->>+Working Directory: git pull (shortcut for git fetch followed by git merge for a 'tracking branch') --> ![Development lifecycle with Git, containing Git commands add, commit, push, fetch, restore, merge and pull](../fig/git-lifecycle.svg){: .image-with-shadow width="600px"}

From ae320d034c63ff2e29d6c418672065a9daea8b75 Mon Sep 17 00:00:00 2001 From: Aleksandra Nenadic Date: Thu, 3 Oct 2024 12:08:52 +0100 Subject: [PATCH 3/4] Update git-lifecycle.svg --- fig/git-lifecycle.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fig/git-lifecycle.svg b/fig/git-lifecycle.svg index 63150b2ee..5f420841b 100644 --- a/fig/git-lifecycle.svg +++ b/fig/git-lifecycle.svg @@ -1 +1 @@ -Remote RepositoryLocal RepositoryStaging AreaWorking DirectoryRemote RepositoryLocal RepositoryStaging AreaWorking Directorygit addgit commitgit pushgit fetchgit checkoutgit mergegit pull (shortcut for git fetch followed by git checkout/merge) +Remote Repository BranchLocal Repository BranchStaging AreaWorking DirectoryRemote Repository BranchLocal Repository BranchStaging AreaWorking Directorygit addgit commitgit pushgit fetchgit mergegit pull (shortcut for git fetch followed by git merge for a 'tracking branch') From d46b07f0b3cc5117b01e1f7cca125ff712d3f07c Mon Sep 17 00:00:00 2001 From: Aleksandra Nenadic Date: Thu, 3 Oct 2024 12:09:39 +0100 Subject: [PATCH 4/4] Fix SVG diagram link --- _episodes/14-collaboration-using-git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/14-collaboration-using-git.md b/_episodes/14-collaboration-using-git.md index e065c47c0..ed5e28979 100644 --- a/_episodes/14-collaboration-using-git.md +++ b/_episodes/14-collaboration-using-git.md @@ -109,7 +109,7 @@ sequenceDiagram --> ![Development lifecycle with Git, containing Git commands add, commit, push, fetch, restore, merge and pull](../fig/git-lifecycle.svg){: .image-with-shadow width="600px"}