Skip to content

Wrong base#28

Closed
infinisil wants to merge 2 commits intostagingfrom
wrong-base-1
Closed

Wrong base#28
infinisil wants to merge 2 commits intostagingfrom
wrong-base-1

Conversation

@infinisil
Copy link
Copy Markdown

No description provided.

@infinisil-s-code-owner-test-app
Copy link
Copy Markdown

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

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch:
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
    git rebase --onto 77f284eb909fc3a1e5f37375fbeba581946677b6 c95faa2131b0298e31ab81a008f2e8c607ba5dd7
    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