From 1e2af024fe577e997d2bf7a38e3f190f4991b884 Mon Sep 17 00:00:00 2001 From: Milind Joshi Date: Fri, 22 Aug 2014 18:08:46 +0530 Subject: [PATCH 1/4] Create another-file --- another-file | 1 + 1 file changed, 1 insertion(+) create mode 100644 another-file diff --git a/another-file b/another-file new file mode 100644 index 00000000..ef934c58 --- /dev/null +++ b/another-file @@ -0,0 +1 @@ +This file was created after the repo was forked. From 6902b31947a8901cc5a13ab0359927f652310c3f Mon Sep 17 00:00:00 2001 From: fradarr Date: Sun, 5 Apr 2015 06:19:45 +0200 Subject: [PATCH 2/4] Create testmeorcancel --- testmeorcancel | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 testmeorcancel diff --git a/testmeorcancel b/testmeorcancel new file mode 100644 index 00000000..4f248273 --- /dev/null +++ b/testmeorcancel @@ -0,0 +1,3 @@ + + would be nice to have /* + From a236a473a2437f2a6e5b9c9aa3de356dbb1fbf93 Mon Sep 17 00:00:00 2001 From: fradarr Date: Sun, 5 Apr 2015 06:33:20 +0200 Subject: [PATCH 3/4] I do the change I change and you merge ... --- another-file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/another-file b/another-file index ef934c58..733cc247 100644 --- a/another-file +++ b/another-file @@ -1 +1 @@ -This file was created after the repo was forked. +This file was changed and I prefer it this way ;) From 1d1139f8ac26bfc0201362a2f6aaad3dc8831e2b Mon Sep 17 00:00:00 2001 From: fradarr Date: Sun, 5 Apr 2015 12:04:39 +0200 Subject: [PATCH 4/4] merge it ASAP --- postproduction/newfileinpostproductionbranch | 1 + 1 file changed, 1 insertion(+) create mode 100644 postproduction/newfileinpostproductionbranch diff --git a/postproduction/newfileinpostproductionbranch b/postproduction/newfileinpostproductionbranch new file mode 100644 index 00000000..8bb947d3 --- /dev/null +++ b/postproduction/newfileinpostproductionbranch @@ -0,0 +1 @@ +hey yo here we go