Skip to content

Fix error message about merge conflicts #8883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2024
+2 −2
Merged

Fix error message about merge conflicts #8883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ jobs:
const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
const header = `<!-- merge pr=${pr.number} -->\n`;

const fail_msg = header + ':red_circle: Unable to merge your PR into the `main` branch. '
+ 'Please rebase or merge it with the `main` branch.'
const fail_msg = header + ':red_circle: Unable to merge your PR into the base branch. '
+ 'Please rebase or merge it with the base branch.'

let i = 0;

Expand Down