Uploaded image for project: 'Skara'
  1. Skara
  2. SKARA-941

Warn about required merge after dependent PR integration

    XMLWordPrintable

    Details

    • Type: Enhancement
    • Status: Resolved
    • Priority: P4
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 0.9
    • Component/s: bots
    • Labels:
      None

      Description

      If you use dependent PRs, and integrate the first one (the one without a dependency), then the diff of the second PR will show the contents of both PRs.

      This is fine if all you're going to do is to integrate the second PR, but if you want to continue the review process, then this will be very confusing for the reviewers.

      To solve this, the PR owner can merge the master branch into the branch of the second PR. After that, the diff will look correct again.

      I think it would be good if the bots could inject some kind of warning / help message about this when a dependent PR is integrated.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              rwestberg Robin Westberg (Inactive)
              Reporter:
              stefank Stefan Karlsson
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: