You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/teamwork.md
+18-24Lines changed: 18 additions & 24 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -45,21 +45,17 @@ NOTE: GitHub previously used "master", but is now using "main" as the name for t
45
45
46
46
## Concepts and commands
47
47
48
-
<!-- .slide: style="font-size: 28px;" -->
49
-
50
48
In these exercises we will use only a few commands. These have all been mentioned before in this course, but as a refresher I will briefly discuss a couple commands here, namely:
51
49
52
50
-`git fetch`: This is a primary command used to download contents from a remote repository.
53
-
- example: your teammate has created a new feature branch which they have pushed to the remote repository, but which you do not yet have in your local repository
51
+
- example: your teammate has created a new feature branch which they have pushed to the remote repository, but which you do not yet have in your local repository
54
52
-`git push`: This is essentially the same as running `git merge main` from inside the remote repository. It is mostly used to upload local changes to a remote repository.
55
53
-`git pull`: This will fetch the latest changes from the current branch from a remote, then apply the changes to your local copy of the branch. It is similar to doing a fetch and a merge.
56
54
57
55
---
58
56
59
57
## Git push
60
58
61
-
<!-- .slide: style="font-size: 30px;" -->
62
-
63
59
```shell
64
60
$ git push <remote-repo><branch>
65
61
```
@@ -74,26 +70,24 @@ where the default behaviour is pushing to repository "origin" and the same branc
74
70
75
71
---
76
72
77
-
<!-- .slide: style="font-size: 30px;" -->
78
-
79
73
Before pushing:
80
-
```graphviz
81
-
digraph {
82
-
rankdir=LR
83
-
node [shape=circle width=0.5 fixedsize=shape]
84
-
edge [arrowhead=none][shape=none]
85
-
"a" -> "b"
86
-
a [fixedsize=true label=" "]
87
-
"b" -> "c"
88
-
b [fixedsize=true label=" "]
89
-
"c" -> "d"
90
-
c [fixedsize=true label=" "]
91
-
d [fixedsize=true label=" " style=filled fillcolor=blue]
0 commit comments