Skip to content

Merging a sandbox warns that the parent has moved on, when it was our own merge #5167

Description

@elias-ba

Merge a sandbox into its parent, then merge again. The second one warns that the parent has changed since the sandbox was created, so it looks like someone else has been working there and your promote will overwrite them. Nobody has. The thing that moved the parent was your own first merge.

The warning exists for a real case, so we can't just drop it. What is missing is that a merge doesn't record where it left the parent, so the next one has nothing to compare against except "the parent is different from when this sandbox was made", which is true and useless.

Activity

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

    • Status
      Done

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions