From 53bdc9b4c03e47b9dd750b2794a6841bfdda9596 Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Fri, 23 Aug 2019 04:07:19 -0700 Subject: [PATCH 1/8] sample commit --- java-maven-junit-helloworld-master/Readme.txt.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 java-maven-junit-helloworld-master/Readme.txt.txt diff --git a/java-maven-junit-helloworld-master/Readme.txt.txt b/java-maven-junit-helloworld-master/Readme.txt.txt new file mode 100644 index 0000000..843a756 --- /dev/null +++ b/java-maven-junit-helloworld-master/Readme.txt.txt @@ -0,0 +1 @@ +This is my Text file. \ No newline at end of file From ecfd17f6b0f6a10042c914751a86c7ec17676816 Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Sun, 1 Sep 2019 01:50:38 -0700 Subject: [PATCH 2/8] Reame.txt file is modified --- java-maven-junit-helloworld-master/Readme.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-maven-junit-helloworld-master/Readme.txt b/java-maven-junit-helloworld-master/Readme.txt index 221c907..c7c97f1 100644 --- a/java-maven-junit-helloworld-master/Readme.txt +++ b/java-maven-junit-helloworld-master/Readme.txt @@ -1 +1,2 @@ -This is Sample Text File. \ No newline at end of file +This is Sample Text File. +This file is modified in IntelliJ IDEA. \ No newline at end of file From 243f8de54b5e54c253e1904c9b12a119113ea245 Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Sun, 1 Sep 2019 02:06:45 -0700 Subject: [PATCH 3/8] test branc created and readme.txt file modofied. --- .idea/.gitignore | 2 ++ .idea/Jenkins.iml | 9 +++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ java-maven-junit-helloworld-master/Readme.txt | 4 +++- 6 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/Jenkins.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/Jenkins.iml b/.idea/Jenkins.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Jenkins.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..90f57e5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/java-maven-junit-helloworld-master/Readme.txt b/java-maven-junit-helloworld-master/Readme.txt index c7c97f1..ad5f8df 100644 --- a/java-maven-junit-helloworld-master/Readme.txt +++ b/java-maven-junit-helloworld-master/Readme.txt @@ -1,2 +1,4 @@ This is Sample Text File. -This file is modified in IntelliJ IDEA. \ No newline at end of file +This file is modified in IntelliJ IDEA. + +This file is created in my_test_branch. \ No newline at end of file From f67892c6e92163a396cf26e7a75af1e581037981 Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Sun, 1 Sep 2019 02:28:37 -0700 Subject: [PATCH 4/8] .idea directory added --- .idea/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..f22d961 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,4 @@ +# Default ignored files +/workspace.xml +# Default ignored files +/workspace.xml \ No newline at end of file From 63b9a2e1d9f038c9049c6bbe3a6a62c8dd75bfbe Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Sun, 1 Sep 2019 02:32:34 -0700 Subject: [PATCH 5/8] .idea directory added2 --- .idea/Jenkins.iml | 9 +++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ 4 files changed, 29 insertions(+) create mode 100644 .idea/Jenkins.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/Jenkins.iml b/.idea/Jenkins.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Jenkins.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..90f57e5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From bff97482877644ff070f09cf7d674ac15cd08551 Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Sun, 1 Sep 2019 02:58:31 -0700 Subject: [PATCH 6/8] Readme.txt.txt file is modified' --- java-maven-junit-helloworld-master/Readme.txt.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-maven-junit-helloworld-master/Readme.txt.txt b/java-maven-junit-helloworld-master/Readme.txt.txt index 843a756..b2ee4f0 100644 --- a/java-maven-junit-helloworld-master/Readme.txt.txt +++ b/java-maven-junit-helloworld-master/Readme.txt.txt @@ -1 +1,2 @@ -This is my Text file. \ No newline at end of file +This is my Text file. +This file mofified for git stash test. \ No newline at end of file From 755066b8ab6797bc154572a1226f0f1bfc8fd17b Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Sun, 1 Sep 2019 03:18:34 -0700 Subject: [PATCH 7/8] git stash test --- java-maven-junit-helloworld-master/Readme.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java-maven-junit-helloworld-master/Readme.txt b/java-maven-junit-helloworld-master/Readme.txt index ad5f8df..53965a6 100644 --- a/java-maven-junit-helloworld-master/Readme.txt +++ b/java-maven-junit-helloworld-master/Readme.txt @@ -1,4 +1,6 @@ This is Sample Text File. This file is modified in IntelliJ IDEA. -This file is created in my_test_branch. \ No newline at end of file +This file is created in my_test_branch. + +This file will now be merged with master branch. \ No newline at end of file From ad3f87fe0c95740cb813c97b9b00e2efeaf78f5e Mon Sep 17 00:00:00 2001 From: "Manish, Yadav" Date: Sun, 1 Sep 2019 04:44:55 -0700 Subject: [PATCH 8/8] test file will be added to git hub --- java-maven-junit-helloworld-master/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 java-maven-junit-helloworld-master/test.txt diff --git a/java-maven-junit-helloworld-master/test.txt b/java-maven-junit-helloworld-master/test.txt new file mode 100644 index 0000000..29ca791 --- /dev/null +++ b/java-maven-junit-helloworld-master/test.txt @@ -0,0 +1 @@ +this is just a test file. \ No newline at end of file