-
Notifications
You must be signed in to change notification settings - Fork 49
/
Remote-Solutions.txt
95 lines (64 loc) · 1.16 KB
/
Remote-Solutions.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
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
1.1 Clone Intro
git clone
1.2 Remote Branches
git commit
git checkout o/main
git commit
1.3 Git Fetchin’
git fetch
1.4 Git Pullin’
git pull
1.5 Fakeing Teamwork
git clone
git fakeTeamwork main 2
git commit
git pull
1.6 Git Pushin’
git commit
git commit
git push
1.7 Diverged History
git clone
git fakeTeamwork
git commit
git pull --rebase
git push
1.8 Locked branch main
git reset --hard o/main
git checkout -b feature C2
git push origin feature
2.1 Push main!
git rebase side1 side2
git rebase side2 side3
git rebase side3 main
git pull --rebase
git push
2.2 Merging with remotes
git checkout main
git pull
git merge side1
git merge side2
git merge side3
git push
2.3 Remoting Tracking
git checkout -b side o/main
git commit
git pull --rebase
git push
2.4 Git push arguments
git push origin main
git push origin foo
2.5 Git push arguments — Expanded!
git push origin main~1:foo
git push origin foo:main
2.6 Fetch arguments
git fetch origin main~1:foo
git fetch origin foo:main
git checkout foo
git merge main
2.7 Source of nothing
git push origin :foo
git fetch origin :bar
2.8 Pull arguments
git pull origin bar:foo
git pull origin main:side