-
Notifications
You must be signed in to change notification settings - Fork 1
/
00_05_git.qmd
139 lines (72 loc) · 3.67 KB
/
00_05_git.qmd
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
---
title: "P04. Git and Github"
---
## Before you start
1\. Check if git is installed
Go to a Command Prompt window and type:
```{}
git --version
```
If not, then go to: <https://git-scm.com/download> and run the download. Accept all default options.
2\. Create a github account: github.com/join
3\. Download GitHub Desktop: <https://desktop.github.com/>
Open it, and sign in using your GitHub account
## Working on your own
1\. Open GitHub Desktop
2\. There should be 4 options underneath "Let's get started!"
3\. Click "Create a New Repository on your Hard Drive"
4\. Fill in the details about your new repository
5\. Create Repository
6\. Once you've created it, it asks if you would like to publish to GitHub. Say yes!
7\. What happened now? Hint: check on github.com in your account
8\. The app asks if you want to view the Files in the repository
9\. Say yes. Is there anything there?
10\. Go back to RStudio, and create a new R script. Write something, then save the script into the repository.
11\. What has happened in the GitHub Desktop app?
12\. Now we are going to commit this change. In the app make sure the file is selected in the check box. Write a commit message (make it useful, but not too long). Press commit.
13\. What has happened? Has the file appeared on github.com?
14\. The blue button asks if you want to push to the origin. Say yes.
15\. What has happened now? Has the file appeared on github.com? Can you see the commit message?
16\. Go back to RStudio. Make some changes to the script. Save it.
17\. Check in the GitHub app. What has happened?
18\. Add a commit message, commit, and push.
19\. Go back to RStudio, make another script and save it in the same folder.
20\. Commit and push.
## Now what?
1\. Find the repository folder.
2\. DELETE IT!
3\. Go back to the GitHub app. What does it say?
4\. Press "Clone again".
5\. What has happened?
## What if the repository exists on Github but you want to work on a different computer?
1\. Delete the repository folder again.
2\. In the app, this time click "remove".
---\> OH NO! (or is it...)
3\. Back at the main menu, click "Clone a Repository from the Internet"
4\. Select the URL tab, and put in the URL of the repository on GitHub, click Clone.
5\. Check for the folder on your computer.
It's back! (or it should be)
If you were working on this analysis on 2 (or more) computers, git can help you stay up to date.
But, the difference is you need the "Pull" button as well.
What does this do?
Key points:
\- Whenever you save a file in the repository (the special folder) the App will track it.
\- If you want to keep those changes, commit and push them to github.com.
\- Write a useful commit message for each one, to help you remember what they do.
\- Make each commit quite small (\~2-5 per day, if you're doing analysis all day)
\- More than 1 person can do this at the same time and it will help you keep track of all the changes.
## Extension: What does Git Ignore do?
## Extension: Pair exercise
1\. Invite your partner to your repository
2\. Modify the file in this repository and then save, commit and push it.
3\. Now the partner should check if they have the changes. No!
4\. They need to "Pull" changes from github.com. Find the right button, and click it.
5\. Do the same, but for the other partner.
6\. Next, both edit the same file, commit the changes, and both push at the same time.
7\. What has happened?
You've got a merge conflict!
8\. Follow the instructions to choose the lines you want to keep in the file
9\. Then commit and merge! And push the commit.
10\. Check on github.com how this looks in the commit log.
11\. Both pull and check what the file looks like now.
Well done!