diff --git a/_episodes/14-collaboration-using-git.md b/_episodes/14-collaboration-using-git.md index 4807c9581..ed5e28979 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,18 +101,17 @@ 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 checkout - Local Repository->>+Working Directory:git merge - Remote Repository->>+Working Directory: git pull (shortcut for git fetch followed by git checkout/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, 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
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 @@ - +