Merge pull request PixarAnimationStudios#483 from autodesk-forks/reso…

…lve/adsk/internal-only/feature/pipeline_adsk Update Pipeline of adsk/dev To Get First Conflicted Commit
autodesk-forks · Jun 30, 2023 · 994676d · 994676d
2 parents f59321b + bb99d1b
commit 994676d
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