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

Optionally allow rebase before push from Git publisher

    XMLWordPrintable

Details

    • git plugin 4.1.0

    Description

      Assume during our build someone else pushed unrelated changes (commitFile1) to the remote repo. So our own changes committed during the build (commitFile2) cannot be pushed back to the remote origin.

      * 0eb2599 (HEAD) changed commitFile2
      | * 64e71e7 (origin/master) changed commitFile1
      |/
      * b2578eb init
      

      To resolve this we can fetch the remote changes and rebase our own changes just before the push of the branches.

      * 0e7674c (HEAD) changed commitFile2
      * 64e71e7 (origin/master) changed commitFile1
      * b2578eb init
      

      Provide a checkbox that will allow "Rebase before push" as an option in the "Branches to push to remote repositories". When enabled we try to rebase before the actual push.

      Attachments

        Activity

          markewaite Mark Waite created issue -
          markewaite Mark Waite added a comment -

          Merged to master branch Dec 20, 2019. Planned for inclusion in git plugin 4.1 to be released by Dec 31, 2019.

          markewaite Mark Waite added a comment - Merged to master branch Dec 20, 2019. Planned for inclusion in git plugin 4.1 to be released by Dec 31, 2019.
          markewaite Mark Waite made changes -
          Field Original Value New Value
          Resolution Fixed [ 1 ]
          Status Open [ 1 ] Fixed but Unreleased [ 10203 ]
          markewaite Mark Waite added a comment -

          Fixed in git plugin 4.1.0, released Jan 18, 2020.

          markewaite Mark Waite added a comment - Fixed in git plugin 4.1.0, released Jan 18, 2020.
          markewaite Mark Waite made changes -
          Released As git plugin 4.1.0
          Status Fixed but Unreleased [ 10203 ] Closed [ 6 ]

          People

            markewaite Mark Waite
            markewaite Mark Waite
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: