Manually merge in release script to avoid merge-up pull requests

XMLWordPrintableJSON

    • Type: Task
    • Resolution: Done
    • Priority: Unknown
    • None
    • Affects Version/s: None
    • Component/s: None
    • None
    • None
    • PHP Drivers
    • Hide

      1. What would you like to communicate to the user about this feature?
      2. Would you like the user to see examples of the syntax and/or executable code and its output?
      3. Which versions of the driver/connector does this apply to?

      Show
      1. What would you like to communicate to the user about this feature? 2. Would you like the user to see examples of the syntax and/or executable code and its output? 3. Which versions of the driver/connector does this apply to?
    • None
    • None
    • None
    • None
    • None
    • None

      After a release is triggered using the Release workflow, a merge-up pull request is created which has conflicts that need manual resolution. This can be avoided by merging to the next branch using the ours strategy and pushing this next branch before pushing the release branch.

      Note: this requires extracting the next-branch-finding logic from the merge-up action for re-use in the release workflow.

            Assignee:
            Unassigned
            Reporter:
            Andreas Braun
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

              Created:
              Updated:
              Resolved: