Skip to content

Commit 8168ef3

Browse files
authored
Merge pull request #5 from esciencecenter-digital-skills/remove-git-checkout
2 parents 3b39d9f + c802728 commit 8168ef3

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

episodes/14-collaboration-using-git.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ sequenceDiagram
113113
Staging Area->>+Local Repository: git commit
114114
Local Repository->>+Remote Repository: git push
115115
Remote Repository->>+Local Repository: git fetch
116-
Local Repository->>+Working Tree:git checkout
116+
Local Repository->>+Working Tree:git restore
117117
Local Repository->>+Working Tree:git merge
118-
Remote Repository->>+Working Tree: git pull (shortcut for git fetch followed by git checkout/merge)
118+
Remote Repository->>+Working Tree: git pull (shortcut for git fetch followed by git merge)
119119
-->
120120

121121
<!--

0 commit comments

Comments
 (0)