From 289d8a3738eb6df1d1b98048fc6ed3a8638ad151 Mon Sep 17 00:00:00 2001 From: Rajesh Pandurangan Date: Wed, 22 Apr 2015 12:57:47 +0530 Subject: [PATCH 1/3] hello-one.cs is created hello-one.cs is created in branch three also --- hello-one.cs | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 hello-one.cs diff --git a/hello-one.cs b/hello-one.cs new file mode 100644 index 0000000..552b872 --- /dev/null +++ b/hello-one.cs @@ -0,0 +1,4 @@ +//Same file name created in another branch also +/** +wanted to see what will happen if we create the same file name in two different branches +*/ From e80b2d28571dc54f90e296aed5037a534358faab Mon Sep 17 00:00:00 2001 From: Rajesh Pandurangan Date: Wed, 22 Apr 2015 12:58:45 +0530 Subject: [PATCH 2/3] Update README.md added some test content --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1358602..f1595b2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # hello-world Learning Git Hub This is a sample repository that is created to learn git hub. Rajesh +This line is added in branch 3 From a744eb785e59cce98dc700ebb09e0a429cefeb3c Mon Sep 17 00:00:00 2001 From: Rajesh Pandurangan Date: Wed, 22 Apr 2015 13:03:16 +0530 Subject: [PATCH 3/3] Update hello-one.cs --- hello-one.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/hello-one.cs b/hello-one.cs index 552b872..49aabd7 100644 --- a/hello-one.cs +++ b/hello-one.cs @@ -2,3 +2,4 @@ /** wanted to see what will happen if we create the same file name in two different branches */ +//edited in master after the merge