Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-56924

Add option to merge with master first

    XMLWordPrintable

    Details

    • Similar Issues:

      Description

      core-pr-tester should have an option to merge into master first, and fail on conflict.

      This would allow allow to test even older PRs, that are otherwise fine (i.e. no conflicts), on the latest master. I had to manually merge and update https://github.com/jenkinsci/jenkins/pull/2844 earlier because I wanted to run it on the latest version rather than its 2 years old HEAD. It would be much easier if the core-pr-tester would do that for me.

        Attachments

          Issue Links

            Activity

            danielbeck Daniel Beck created issue -
            batmat Baptiste Mathus made changes -
            Field Original Value New Value
            Link This issue is blocked by INFRA-2071 [ INFRA-2071 ]
            batmat Baptiste Mathus made changes -
            Status Open [ 1 ] In Progress [ 3 ]
            Hide
            batmat Baptiste Mathus added a comment -

            I believe I have the fix locally, but waiting on INFRA-2071 to be able to add automated PR testing on the changes before I add them.

            Show
            batmat Baptiste Mathus added a comment - I believe I have the fix locally, but waiting on INFRA-2071 to be able to add automated PR testing on the changes before I add them.
            batmat Baptiste Mathus made changes -
            Status In Progress [ 3 ] In Review [ 10005 ]
            batmat Baptiste Mathus made changes -
            Labels blocked

              People

              Assignee:
              batmat Baptiste Mathus
              Reporter:
              danielbeck Daniel Beck
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated: