-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathTerminal Saved Output.txt
82 lines (82 loc) · 4.75 KB
/
Terminal Saved Output.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
Last login: Mon Feb 26 15:41:50 on ttys000
g% (base) Chinmay@McSiddhant ~ % cd patchwork
(base) Chinmay@McSiddhant patchwork % git checkout add-TheSiddyBoi
D CONTRIBUTORS/contributors/add-TheSiddyBoi.txt
Already on 'add-TheSiddyBoi'
(base) Chinmay@McSiddhant patchwork % git add -A
(base) Chinmay@McSiddhant patchwork % git commit -m "move file into contributors folder
dquote> "
[add-TheSiddyBoi e68e46608c] move file into contributors folder
1 file changed, 1 insertion(+)
create mode 100644 CONTRIBUTORS/add-TheSiddyBoi.txt
(base) Chinmay@McSiddhant patchwork % git pull origin add-TheSiddyBoi
From https://github.com/TheSiddyBoi/patchwork
* branch add-TheSiddyBoi -> FETCH_HEAD
Already up to date.
(base) Chinmay@McSiddhant patchwork % git checkout gh-pages
Switched to branch 'gh-pages'
Your branch is up to date with 'origin/gh-pages'.
(base) Chinmay@McSiddhant patchwork % git merge add-TheSiddyBoi
Updating 46963eb6ce..e68e46608c
Fast-forward
CONTRIBUTORS/add-TheSiddyBoi.txt | 1 +
CONTRIBUTORS/contributors/add-TheSiddyBoi.txt | 1 +
2 files changed, 2 insertions(+)
create mode 100644 CONTRIBUTORS/add-TheSiddyBoi.txt
create mode 100644 CONTRIBUTORS/contributors/add-TheSiddyBoi.txt
(base) Chinmay@McSiddhant patchwork % git branch -d add-TheSiddyBoi
Deleted branch add-TheSiddyBoi (was e68e46608c).
(base) Chinmay@McSiddhant patchwork % git push origin --delete add-TheSiddyBoi
To https://github.com/TheSiddyBoi/patchwork.git
- [deleted] add-TheSiddyBoi
(base) Chinmay@McSiddhant patchwork % git pull upstream gh-pages
remote: Enumerating objects: 75, done.
remote: Counting objects: 100% (71/71), done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 58 (delta 29), reused 44 (delta 17), pack-reused 0
Unpacking objects: 100% (58/58), 11.41 KiB | 137.00 KiB/s, done.
From https://github.com/jlord/patchwork
* branch gh-pages -> FETCH_HEAD
* [new branch] gh-pages -> upstream/gh-pages
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
(base) Chinmay@McSiddhant patchwork % git config pull.rebase false
(base) Chinmay@McSiddhant patchwork % git pull upstream gh-pages
From https://github.com/jlord/patchwork
* branch gh-pages -> FETCH_HEAD
hint: Waiting for your editor to close the file...
Merged due to error for push request requiring a merge request.
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
-- INSERT --