Merge remote-tracking branch 'origin/adsk/internal-only/feature/pipel…

…ine_adsk' into resolve/adsk/internal-only/feature/pipeline_adsk
autodesk-forks · Jun 30, 2023 · bb99d1b · bb99d1b
2 parents f59321b + d746123
commit bb99d1b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -165,7 +165,7 @@ if (isDevBranch()) {
           }
           if (gitMergeMsg.contains("CONFLICT"))
           {
-            def mergeLog = COMMONSHELL.capture_script_output("git log --merge \"^resolve/dev\" origin/dev --oneline")
+            def mergeLog = COMMONSHELL.capture_script_output("git log --merge --reverse \"^resolve/dev\" origin/dev --oneline")
             def conflictCommitId = mergeLog.tokenize()[0]
             COMMONSHELL.shell """\
                     git merge --abort