Merge branch 'Integration-Releases'
Conflicts:
AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
diff --git a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
index b7875e2..89f0fe3 100644
--- a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
+++ b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
@@ -9,7 +9,15 @@
<title>Registration Page EMP</title>
</head>
<body>
+<<<<<<< HEAD
<h1>Cognizant Technology </h1>
+=======
+<<<<<<< HEAD
+<h1>Cognizant Test </h1>
+=======
+<h1>Cognizant Technology Solution</h1>
+>>>>>>> 46b94971157004bc4e2b04087cbc98cdd0caf8ef
+>>>>>>> refs/heads/Integration-Releases
<form:form method="POST" commandName="user">
<table>
@@ -58,4 +66,4 @@
</form:form>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/Auto_Merge.sh b/Auto_Merge.sh
new file mode 100644
index 0000000..5597ea1
--- /dev/null
+++ b/Auto_Merge.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Automatically merge the last commit through the following branches:
+# Integration-Releases -} master
+
+#git checkout -b issue-001 master
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+LAST_COMMIT=$(git rev-list -1 HEAD)
+
+echo Automatically merging commit $LAST_COMMIT from $CURRENT_BRANCH rippling to master
+
+case $CURRENT_BRANCH in
+issue-001)
+
+ git checkout master
+ git merge $CURRENT_BRANCH
+ git push
+ git checkout Integration-Releases
+ git merge $CURRENT_BRANCH
+ git push
+ #git branch -d issue-#001
+ ;;
+esac
\ No newline at end of file
diff --git a/Auto_Merge1.bat b/Auto_Merge1.bat
new file mode 100644
index 0000000..bf36116
--- /dev/null
+++ b/Auto_Merge1.bat
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Automatically merge the last commit through the following branches:
+# Integration-Releases -} master
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+LAST_COMMIT=$(git rev-list -1 HEAD)
+
+echo Automatically merging commit $LAST_COMMIT from $CURRENT_BRANCH rippling to master
+
+case $CURRENT_BRANCH in
+Integration-Releases)
+ #git checkout Integration-Releases
+ #git merge $CURRENT_BRANCH
+ git checkout master
+ git merge $CURRENT_BRANCH
+ git checkout $CURRENT_BRANCH
+ ;;
+esac
\ No newline at end of file
diff --git a/autofile.txt b/autofile.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/autofile.txt
diff --git a/bash.exe.stackdump b/bash.exe.stackdump
new file mode 100644
index 0000000..24ab765
--- /dev/null
+++ b/bash.exe.stackdump
@@ -0,0 +1,9 @@
+Stack trace:
+Frame Function Args
+00000226178 0018007208E (0018026056D, 00180215E46, 00000226178, 00000225070)
+00000226178 00180046DF2 (000002260D8, 00000000000, 00000000000, 001005E6E6C)
+00000226178 00180046E32 (00180260629, 00000226028, 00000226178, 00000000000)
+00000226178 001800BDE7F (00000000000, 00000000000, 00000000000, 00000000000)
+00000226178 001800BE09F (000002261A0, 00000000000, 00000000000, 00000000000)
+00000226220 001800BF35A (000002261A0, 00000000000, 00000000000, 00000000000)
+End of stack trace