Skip to content

Commit 25fe897

Browse files
authored
remove checkout references from episode 14 diagram
1 parent 9922f5b commit 25fe897

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

_episodes/14-collaboration-using-git.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ sequenceDiagram
105105
Staging Area->>+Local Repository: git commit
106106
Local Repository->>+Remote Repository: git push
107107
Remote Repository->>+Local Repository: git fetch
108-
Local Repository->>+Working Directory:git checkout
108+
Local Repository->>+Working Directory:git restore
109109
Local Repository->>+Working Directory:git merge
110-
Remote Repository->>+Working Directory: git pull (shortcut for git fetch followed by git checkout/merge)
110+
Remote Repository->>+Working Directory: git pull (shortcut for git fetch followed by git merge)
111111
-->
112112
<!--
113113
SVG of the diagram can be downloaded from:
114114
[![](https://mermaid.ink/img/pako:eNqVUj1PwzAQ_SvWTSCK2D1UQuoISzuwZDnsi2PVzgXnLBRV_e_YiSoKUZHwdL57T-_dxwkMWwINI31k6g3tPLqEselVeW-cjr53aucTGeE0PW63DwdBV5PPiVAr50WhtQv-ulShL2wwqD0NPPpKX-CGY_SyMH4jKmtPkYVWtCGP3UJaAW5rtSSmuy31o5fZW0fmyFn-QYmUHP1hbDXESzshqLux4yQmF6Ocvg2XXwj8SVa9T-ra1tMsdg8bKEFEb8vmTlW7AekoUgO6hJZazEEaaPpzgWIWPky9AS0p0wbyYFEuiwbdYhhLlmx1_Lpcw3wU5y-9M7w9?type=png)](https://mermaid.live/edit#pako:eNqVUj1PwzAQ_SvWTSCK2D1UQuoISzuwZDnsi2PVzgXnLBRV_e_YiSoKUZHwdL57T-_dxwkMWwINI31k6g3tPLqEselVeW-cjr53aucTGeE0PW63DwdBV5PPiVAr50WhtQv-ulShL2wwqD0NPPpKX-CGY_SyMH4jKmtPkYVWtCGP3UJaAW5rtSSmuy31o5fZW0fmyFn-QYmUHP1hbDXESzshqLux4yQmF6Ocvg2XXwj8SVa9T-ra1tMsdg8bKEFEb8vmTlW7AekoUgO6hJZazEEaaPpzgWIWPky9AS0p0wbyYFEuiwbdYhhLlmx1_Lpcw3wU5y-9M7w9)
115115
-->
116-
![Development lifecycle with Git, containing Git commands add, commit, push, fetch, checkout, merge and pull](../fig/git-lifecycle.svg){: .image-with-shadow width="600px"}
116+
![Development lifecycle with Git, containing Git commands add, commit, push, fetch, restore, merge and pull](../fig/git-lifecycle.svg){: .image-with-shadow width="600px"}
117117
<p style="text-align: center;">
118118
Software development lifecycle with Git
119119
</p>

0 commit comments

Comments
 (0)