Skip to content

Wrong base#21

Closed
infinisil wants to merge 3 commits intomasterfrom
wrong-base
Closed

Wrong base#21
infinisil wants to merge 3 commits intomasterfrom
wrong-base

Conversation

@infinisil
Copy link

No description provided.

@infinisil-s-code-owner-test-app

The PR's base branch is set to master, but 1 commits from the staging branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the staging branch, change the base branch to staging
  • If the changes should go to the master branch, rebase your PR onto the merge base with the staging branch:
    git rebase --onto 9ccc582df5fb43ce5a13946923c4a2285a62297e b5f7de21184370cbf893a89b4de261b120df0d28
    git push --force-with-lease
    

@infinisil-s-code-owner-test-app

The PR's base branch is set to master, but 1 commits from the staging branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the staging branch, change the base branch to staging
  • If the changes should go to the master branch, rebase your PR onto the merge base with the staging branch:
    git rebase --onto 5f90ef0bbc4bee2b3f1202e4874d9b411c3b2848 1aff2334caaf7edd953631fe40c3bf189a8b05bd
    git push --force-with-lease
    

@infinisil-s-code-owner-test-app

The PR's base branch is set to master, but 1 commits from the staging branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the staging branch, change the base branch to staging
  • If the changes should go to the master branch, rebase your PR onto the merge base with the staging branch:
    git rebase --onto 89502f977fcc09ca740d30f37a6fc5733852715d 2e1e0f9fd13646273caaa3eadd9c139d4bce23c3
    git push --force-with-lease
    

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant