From c160da83816b9d0e28add9d0f5418aa19d26e51a Mon Sep 17 00:00:00 2001 From: thai Date: Mon, 23 May 2016 18:31:20 +0900 Subject: [PATCH 1/3] Merge branch test2 Changes to be committed: modified: file1.html renamed: hello1.php -> hello_test1.php renamed: login.html -> login_test2.html --- file1.html | 2 +- hello1.php => hello_test1.php | 0 login.html => login_test2.html | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename hello1.php => hello_test1.php (100%) rename login.html => login_test2.html (100%) diff --git a/file1.html b/file1.html index 22ba2f0..fbc7d93 100644 --- a/file1.html +++ b/file1.html @@ -1,5 +1,5 @@ -

This is a conflict1 file to merge to master

+

'Change2' is a conflict1 file to merge to master

new Tweets for Thai

Add new from test branch master

Add new from branch 1

diff --git a/hello1.php b/hello_test1.php similarity index 100% rename from hello1.php rename to hello_test1.php diff --git a/login.html b/login_test2.html similarity index 100% rename from login.html rename to login_test2.html From c6e010a8951968c9c14d23193866615dac2d2f0f Mon Sep 17 00:00:00 2001 From: thai Date: Mon, 23 May 2016 18:32:45 +0900 Subject: [PATCH 2/3] Revert "Merge branch test2" This reverts commit c160da83816b9d0e28add9d0f5418aa19d26e51a. --- file1.html | 2 +- hello_test1.php => hello1.php | 0 login_test2.html => login.html | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename hello_test1.php => hello1.php (100%) rename login_test2.html => login.html (100%) diff --git a/file1.html b/file1.html index fbc7d93..22ba2f0 100644 --- a/file1.html +++ b/file1.html @@ -1,5 +1,5 @@ -

'Change2' is a conflict1 file to merge to master

+

This is a conflict1 file to merge to master

new Tweets for Thai

Add new from test branch master

Add new from branch 1

diff --git a/hello_test1.php b/hello1.php similarity index 100% rename from hello_test1.php rename to hello1.php diff --git a/login_test2.html b/login.html similarity index 100% rename from login_test2.html rename to login.html From b5c01297acdc59905a5a9df9dc49858c3309b5aa Mon Sep 17 00:00:00 2001 From: thai Date: Thu, 4 Aug 2016 22:44:56 +0900 Subject: [PATCH 3/3] [WIP] test new command