Skip to content

Link to Git guide in rustc-dev-guide on merge conflicts #103

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
Oct 6, 2020
Merged

Link to Git guide in rustc-dev-guide on merge conflicts #103

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 homu/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,8 +1490,8 @@ def fetch_mergeability(mergeable_que):
_blame = ' (presumably {})'.format(issue_or_commit)
state.add_comment(
':umbrella: The latest upstream changes{} made this '
'pull request unmergeable. Please resolve the merge '
'conflicts.\n\n'
'pull request unmergeable. Please [resolve the merge conflicts]' # noqa
'(https://rustc-dev-guide.rust-lang.org/git.html#conflicts).\n\n' # noqa
'*Note that reviewers usually do not review pull requests '
'until merge conflicts are resolved!* Once you resolve '
'the conflicts, you should change the labels applied by '
Expand Down