test merge to master

Jenkinsfile

@@ -9,7 +9,6 @@ node {
     stage('checkout') {
         deleteDir()
         checkout scm
-        sh "git checkout test"
     }
      
     stage('Stop Containers') {

Jenkinsfile.rej

@@ -0,0 +1,9 @@
+diff a/Jenkinsfile b/Jenkinsfile	(rejected hunks)
+@@ -9,6 +9,7 @@
+     stage('checkout') {
+         deleteDir()
+         checkout scm
++        sh "git checkout test"
+     }
+      
+     stage('Stop Containers') {