-
Notifications
You must be signed in to change notification settings - Fork 6
/
Copy pathexample-pull-request.txt
106 lines (94 loc) · 5.05 KB
/
example-pull-request.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
96
97
98
99
100
101
102
103
104
105
106
# UPDATE
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git pull upstream mmaster
From https://github.com/jrdbnntt-com/GrabBag
* branch master -> FETCH_HEAD
Already up-to-date.
# NEW BRANCH
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git branch contribution-example-branch
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git branch
contribution-example-branch
* master
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git checkout contribution-example-branch
Switched to branch 'contribution-example-branch'
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git status
On branch contribution-example-branch
nothing to commit, working directory clean
# MAKE CHANGES NOW
# SAVE CHANGES IN GIT
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git status
On branch contribution-example-branch
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: .idea/misc.xml
modified: README.md
no changes added to commit (use "git add" and/or "git commit -a")
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git add -A
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git status
On branch contribution-example-branch
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: .idea/misc.xml
modified: README.md
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git commit -m "example commit message"
[contribution-example-branch e58c3db] example commit message
2 files changed, 53 insertions(+), 1 deletion(-)
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git status
On branch contribution-example-branch
nothing to commit, working directory clean
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git push origin contribution-example-branch
Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.50 KiB | 0 bytes/s, done.
Total 5 (delta 3), reused 0 (delta 0)
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://[email protected]/jrdbnntt/GrabBag.git
* [new branch] contribution-example-branch -> contribution-example-branch
# DO PULL REQUEST & MERGE IT, RESOLVING CONFLICTS IF NECESSARY. MAY NEED TO PUSH MORE CHANGES TO SAME BRANCH TO FIX CONFLICTS!
# PULL REQUEST COMPLETED AND CHANGES NOW IN UPSTREAM REPO
# GO BACK TO MASTER & UPDATE IT WITH LATEST CHANGES (MORE THAN JUST YOUR EDITS POSSIBLY)
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git pull upstream master
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 5 (delta 3), reused 5 (delta 3), pack-reused 0
Unpacking objects: 100% (5/5), done.
From https://github.com/jrdbnntt-com/GrabBag
* branch master -> FETCH_HEAD
53341d6..365eb8a master -> upstream/master
Updating 53341d6..365eb8a
Fast-forward
.idea/misc.xml | 2 +-
README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git lgg
* 365eb8a - (HEAD -> master, upstream/master) example commit message (#1) (2 minutes ago) <Jared Bennett>
| * e58c3db - (origin/contribution-example-branch, contribution-example-branch) example commit message (3 minutes ago) <jrdbnntt>
|/
* 53341d6 - (origin/master) idea config (35 minutes ago) <jrdbnntt>
* 7512bd0 - init (40 minutes ago) <jrdbnntt>
# NEVER GO BACK TO OLD BRANCH, CAN DELETE NOW
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git branch -D contribution-example-branch
Deleted branch contribution-example-branch (was e58c3db).
jbennett@ubuntu:/home/extra/jbennett/dev/AndroidStudioProjects/GrabBag$ git lggt
* 365eb8a - (HEAD -> master, upstream/master) example commit message (#1) (3 minutes ago) <Jared Bennett>
| * e58c3db - (origin/contribution-example-branch) example commit message (4 minutes ago) <jrdbnntt>
|/
* 53341d6 - (origin/master) idea config (35 minutes ago) <jrdbnntt>
* 7512bd0 - init (40 minutes ago) <jrdbnntt>
# START OVER WITH NEW BRANCH FOR NEXT CHANGE