Skip to content

Release PR into main conflicts when main has commits develop lacks #12

Closed

Description

@b-re-w

python-multiplatform #10 (release -> main) is CONFLICTING: main and develop have diverged (main has 3 commits develop lacks). The generated release commit has develop as its only parent, so the PR has to merge two histories.

Completion: tools/release/test-sync-release.sh covers a diverged main (release takes main as a second parent, main fast-forwards to release, tree stays develop's) and passes; the release PR is mergeable.

Activity

  1. b-re-w commented on Oct 2, 2026

    @b-re-w
    MemberAuthor

    Landed in develop via #13. (Closes #N only fires on merges into the default branch, main.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions