-
Notifications
You must be signed in to change notification settings - Fork 0
/
CommitMerge.txt
43 lines (22 loc) · 1.16 KB
/
CommitMerge.txt
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
How to commit/push/merge
[If you have made changes]
1ST: Commit and push local changes (Remote: YOURNAME-Branch)
[Retrieve data from master branch]
2nd: FETCH (just click ok, no settings need changing)
3rd: Merge (From: Branch: remotes/origin/master)
4th: Push local changes (Remote: YOURNAME-Branch)
[If you wish to add your changes to master branch for everyone else]
5th: Push local changes to master (Remote: master)
Repeat these steps in order everytime
-----------------------------------------------------
Git History
In VS right click solution -> Git History
You might want to have Git History open in background so you can see the changes you make while performing the steps above.
The only three branches you need to worry about:
[remote/origin/master]
Main files that everyone will push goes here. You should [Retrieve data from master branch] if you notice changes.
[remote/origin/Colby-Branch]
This is your remote branch stored on the internet.
[Colby-Branch]
This is your branch stored locally on your computer.
(You should keep your local and remote synced up and then push to master branch when your ready)