Skip to content

test pull request #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xinghuadou-google wants to merge 23 commits into
base: dummy1
Choose a base branch
from
Open

test pull request #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4a1180a
Slightly less bigger
May 1, 2017
a9a517f
Conflicting change at head.
May 1, 2017
5d17ba7
Removing the conflict
May 1, 2017
e352022
New SHA time
May 1, 2017
c8dfa08
Merge remote-tracking branch 'upstream/branch1' into branch1
May 3, 2017
0887d4b
Another dummy file
May 3, 2017
7a5c63c
Create README.md
b-daniels May 3, 2017
a0150c2
Dummy file number 4 added
May 3, 2017
e779c0f
Merge branch 'branch1' of https://github.com/b-daniels-test-org/git-e…
May 3, 2017
f4cac85
Dummy change5
May 11, 2017
6c4bbd7
Merge branch 'branch1' of https://github.com/b-daniels-test-org/git-e…
May 11, 2017
ffc87ce
Adding file 6 at 14:13:00
May 11, 2017
f853c74
File 7
May 11, 2017
98b2512
Adding file 8.
May 11, 2017
29ae312
File 9
May 12, 2017
677072b
Create ping
b-daniels Jun 13, 2017
da49c18
Create ping
xinghuadou-google Jun 13, 2017
4280fc2
added line to ping
Jun 13, 2017
2bd4e4b
Merge branch 'branch1' into branch1
xinghuadou-google Jun 16, 2017
d1ccb6f
Update dummy3
xinghuadou-google Jun 16, 2017
06721f2
Create bybrad
b-daniels Jun 21, 2017
c3c40f5
Merge pull request #4 from xinghuadou-google/branch1
cdbg-integration-tests Jun 21, 2017
9656bae
update foo5
Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# git-experiments
HELLO WORLD!
1 change: 1 addition & 0 deletions bybrad
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Brad's file!
2 changes: 2 additions & 0 deletions dummy3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
foo
foo2
1 change: 1 addition & 0 deletions dummy4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dummy number 4
2 changes: 2 additions & 0 deletions foo5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
5
5
1 change: 1 addition & 0 deletions foo6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6
1 change: 1 addition & 0 deletions foo7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7
1 change: 1 addition & 0 deletions foo8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8
1 change: 1 addition & 0 deletions foo9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
100 changes: 100 additions & 0 deletions logpoint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
y
1 change: 1 addition & 0 deletions lp2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
No conflict
1 change: 1 addition & 0 deletions newsha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gimme a new SHA
Binary file added octokit.tar.gz
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions ping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Ping the pull!
123
a12