Skip to content

merge me #3

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
jci-teska wants to merge 3 commits into
base: master
Choose a base branch
from
Open

merge me #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d1c8d5
Commit newupstreamfile
jci-teska Jun 19, 2013
0828670
commiting stagedlocal.txt
jci-teska Jun 19, 2013
09c29e5
Merge branch 'master' of https://github.com/courtenayt/test
jci-teska Jun 19, 2013
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: 1 addition & 1 deletion newupstreamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
line 1: new file created in upstream
line 1: new file created in upstream # 6/18/13 4:54 jci-teska added non-conflicting text to file that is also updated by courtenayt in master
# 6/18/13 courtenayt: added more text online directly to upstream repository via github ui
# 6/18/13 courtenayt: added even more text online directly to upstream repository via github ui
# 6/19/13 courtenayt: added this line to upstream repository directly
4 changes: 3 additions & 1 deletion stagedlocal.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ line 1: added before stash and before pull from upstream
line 2: added after stage & commit to local - consider this the commited local file

# 6/17/13 4:09pm
jci-teska: added this line
jci-teska: added this line

# 6/18/13 3:02pm jci-teska: addline and then stage file locally