summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Gary Macbook [Thu, 19 Nov 2015 13:03:11 +0000 (14:03 +0100)]
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
Conflicts:
test1.txt
Gary Macbook [Thu, 19 Nov 2015 13:02:35 +0000 (14:02 +0100)]
Revert "user2's changes"
Now I'm not sure what is going on
This reverts commit
b3a8796f786699d7ee19db40b59e99ef935546d8.
Conflicts:
test1.txt
Gary Macbook [Thu, 19 Nov 2015 12:53:03 +0000 (13:53 +0100)]
Reverting file back to earlier version
Gary Macbook [Thu, 19 Nov 2015 09:48:06 +0000 (10:48 +0100)]
user 1 did something stupid, erased whole file!
Gary Macbook [Thu, 19 Nov 2015 09:29:08 +0000 (10:29 +0100)]
Overriding the changes that user 1 made
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
Conflicts:
test1.txt
Gary Macbook [Thu, 19 Nov 2015 09:26:28 +0000 (10:26 +0100)]
user2's changes
Gary Macbook [Thu, 19 Nov 2015 09:21:24 +0000 (10:21 +0100)]
user 1 did something not very nice, deleting all lines of the file and adding a new line user 2 doesn't want
Gary Macbook [Wed, 18 Nov 2015 23:30:03 +0000 (00:30 +0100)]
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
Gary Macbook [Wed, 18 Nov 2015 23:25:47 +0000 (00:25 +0100)]
edit line 3
Gary Macbook [Wed, 18 Nov 2015 23:25:25 +0000 (00:25 +0100)]
edit line 1
Gary Macbook [Wed, 18 Nov 2015 23:21:39 +0000 (00:21 +0100)]
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
Conflicts solved automatically this time.
Gary Macbook [Wed, 18 Nov 2015 23:20:06 +0000 (00:20 +0100)]
a conflict that should auto-solve
Gary Macbook [Wed, 18 Nov 2015 23:11:55 +0000 (00:11 +0100)]
a conflict that should be auto fixable
Gary Macbook [Wed, 18 Nov 2015 23:04:31 +0000 (00:04 +0100)]
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
Conflicts:
test1.txt
Keeping user2 text in merge
Gary Macbook [Wed, 18 Nov 2015 22:56:55 +0000 (23:56 +0100)]
committing the changes by user 2 that make the conflict
Gary Macbook [Wed, 18 Nov 2015 22:53:25 +0000 (23:53 +0100)]
first conflict test
Gary Macbook [Wed, 18 Nov 2015 22:49:29 +0000 (23:49 +0100)]
adding more text
Gary Macbook [Wed, 18 Nov 2015 22:44:06 +0000 (23:44 +0100)]
user2 added some text
Gary Macbook [Wed, 18 Nov 2015 22:21:52 +0000 (23:21 +0100)]
Adding first test file
Gary Macbook [Wed, 18 Nov 2015 21:18:50 +0000 (22:18 +0100)]
removing all files
Steele [Wed, 22 May 2013 21:08:55 +0000 (23:08 +0200)]
test
Steele [Wed, 22 May 2013 21:01:23 +0000 (23:01 +0200)]
more copy edits
Steele [Wed, 22 May 2013 20:56:52 +0000 (22:56 +0200)]
fix conflict
Steele [Wed, 22 May 2013 20:51:28 +0000 (22:51 +0200)]
fix merge
Steele [Wed, 22 May 2013 20:50:15 +0000 (22:50 +0200)]
test
Steele [Wed, 22 May 2013 20:33:21 +0000 (22:33 +0200)]
edit in trymerge
Steele [Wed, 22 May 2013 20:32:51 +0000 (22:32 +0200)]
edit in master
Steele [Wed, 22 May 2013 20:30:49 +0000 (22:30 +0200)]
edit trymerge
Steele [Wed, 22 May 2013 20:26:24 +0000 (22:26 +0200)]
Replaced code1 files with code2 files in the trymerge branch
Steele [Wed, 22 May 2013 20:11:40 +0000 (22:11 +0200)]
initial commit
projects / test.git / log