From 429b7e726994d7fe699a6d266ecbfabc420e29a5 Mon Sep 17 00:00:00 2001 From: Herry Wang Date: Tue, 10 Mar 2015 16:59:38 -0700 Subject: [PATCH 1/7] new file file3 --- file3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file3.txt diff --git a/file3.txt b/file3.txt new file mode 100644 index 0000000..05a1a2f --- /dev/null +++ b/file3.txt @@ -0,0 +1 @@ +br2 From b62f94ea950018615206021ff27e1970baad5f3f Mon Sep 17 00:00:00 2001 From: Herry Wang Date: Tue, 10 Mar 2015 16:59:38 -0700 Subject: [PATCH 2/7] new file file3 --- file3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file3.txt diff --git a/file3.txt b/file3.txt new file mode 100644 index 0000000..05a1a2f --- /dev/null +++ b/file3.txt @@ -0,0 +1 @@ +br2 From f3bec49ab517b3c7a5b32cc0fe345ad7e08f5c14 Mon Sep 17 00:00:00 2001 From: Herry Wang Date: Tue, 10 Mar 2015 17:05:01 -0700 Subject: [PATCH 3/7] testing merge --- file3.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file3.txt b/file3.txt index 05a1a2f..d6eb89e 100644 --- a/file3.txt +++ b/file3.txt @@ -1 +1,2 @@ br2 +merge again From fcecf8e70dda04c1763f33b58fd06f072b938be6 Mon Sep 17 00:00:00 2001 From: Herry Wang Date: Tue, 10 Mar 2015 17:20:23 -0700 Subject: [PATCH 4/7] in master --- file2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file2.txt b/file2.txt index 212659b..bdcfffe 100644 --- a/file2.txt +++ b/file2.txt @@ -1 +1,2 @@ rebase test +Line master From 1f7848d444f88646ce64e0af6de50fb04472734b Mon Sep 17 00:00:00 2001 From: Herry Wang Date: Tue, 10 Mar 2015 17:18:28 -0700 Subject: [PATCH 5/7] in br2 --- file2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file2.txt b/file2.txt index bdcfffe..bb0344d 100644 --- a/file2.txt +++ b/file2.txt @@ -1,2 +1,3 @@ rebase test Line master +Line in br2 From a30f20244a4213c420b924a3e0b8f51e3eee7692 Mon Sep 17 00:00:00 2001 From: Herry Wang Date: Tue, 10 Mar 2015 17:19:06 -0700 Subject: [PATCH 6/7] in br2 #2 --- file2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file2.txt b/file2.txt index bb0344d..7298134 100644 --- a/file2.txt +++ b/file2.txt @@ -1,3 +1,4 @@ rebase test Line master Line in br2 +Line in br2 From fce26c3d617464b7afd53fa478a8e1bf789f8ed3 Mon Sep 17 00:00:00 2001 From: Herry Wang Date: Tue, 10 Mar 2015 17:19:06 -0700 Subject: [PATCH 7/7] in br2 #2 --- file1.txt | 1 + file2.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/file1.txt b/file1.txt index 97acb36..547495f 100644 --- a/file1.txt +++ b/file1.txt @@ -4,3 +4,4 @@ TEST br1: added by user2 br1: added by user1 br1: update +try amend diff --git a/file2.txt b/file2.txt index bb0344d..7298134 100644 --- a/file2.txt +++ b/file2.txt @@ -1,3 +1,4 @@ rebase test Line master Line in br2 +Line in br2