Skip to content

Remove hardcoded master branch reference #427

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 4, 2025
Merged

Remove hardcoded master branch reference #427

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions src/bors/comment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ pub fn merge_conflict_comment(branch: &str) -> Comment {
let message = format!(
r#":lock: Merge conflict

This pull request and the master branch diverged in a way that cannot
be automatically merged. Please rebase on top of the latest master
This pull request and the base branch diverged in a way that cannot
be automatically merged. Please rebase on top of the latest base
branch, and let the reviewer approve again.

<details><summary>How do I rebase?</summary>
Expand All @@ -212,8 +212,8 @@ Assuming `self` is your fork and `upstream` is this repository,
you can resolve the conflict following these steps:

1. `git checkout {branch}` *(switch to your branch)*
2. `git fetch upstream master` *(retrieve the latest master)*
3. `git rebase upstream/master -p` *(rebase on top of it)*
2. `git fetch upstream HEAD` *(retrieve the latest base branch)*
3. `git rebase upstream/HEAD -p` *(rebase on top of it)*
4. Follow the on-screen instruction to resolve conflicts (check `git status` if you got lost).
5. `git push self {branch} --force-with-lease` *(update this PR)*

Expand Down
8 changes: 4 additions & 4 deletions src/bors/handlers/trybuild.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,8 @@ try-job: Bar
insta::assert_snapshot!(tester.get_comment_text(()).await?, @r###"
:lock: Merge conflict

This pull request and the master branch diverged in a way that cannot
be automatically merged. Please rebase on top of the latest master
This pull request and the base branch diverged in a way that cannot
be automatically merged. Please rebase on top of the latest base
branch, and let the reviewer approve again.

<details><summary>How do I rebase?</summary>
Expand All @@ -601,8 +601,8 @@ try-job: Bar
you can resolve the conflict following these steps:

1. `git checkout pr-1` *(switch to your branch)*
2. `git fetch upstream master` *(retrieve the latest master)*
3. `git rebase upstream/master -p` *(rebase on top of it)*
2. `git fetch upstream HEAD` *(retrieve the latest base branch)*
3. `git rebase upstream/HEAD -p` *(rebase on top of it)*
4. Follow the on-screen instruction to resolve conflicts (check `git status` if you got lost).
5. `git push self pr-1 --force-with-lease` *(update this PR)*

Expand Down
8 changes: 4 additions & 4 deletions src/bors/merge_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,8 +814,8 @@ merge_queue_enabled = false
@r#"
:lock: Merge conflict

This pull request and the master branch diverged in a way that cannot
be automatically merged. Please rebase on top of the latest master
This pull request and the base branch diverged in a way that cannot
be automatically merged. Please rebase on top of the latest base
branch, and let the reviewer approve again.

<details><summary>How do I rebase?</summary>
Expand All @@ -824,8 +824,8 @@ merge_queue_enabled = false
you can resolve the conflict following these steps:

1. `git checkout pr-1` *(switch to your branch)*
2. `git fetch upstream master` *(retrieve the latest master)*
3. `git rebase upstream/master -p` *(rebase on top of it)*
2. `git fetch upstream HEAD` *(retrieve the latest base branch)*
3. `git rebase upstream/HEAD -p` *(rebase on top of it)*
4. Follow the on-screen instruction to resolve conflicts (check `git status` if you got lost).
5. `git push self pr-1 --force-with-lease` *(update this PR)*

Expand Down
Loading