Skip to content

Commit d4b8edf

Browse files
committed
Add note about merge conflicts and reviews
1 parent 7e03320 commit d4b8edf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

homu/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ def fetch_mergeability(mergeable_que):
14881488
_blame = ''
14891489
if issue_or_commit:
14901490
_blame = ' (presumably {})'.format(issue_or_commit)
1491-
state.add_comment(':umbrella: The latest upstream changes{} made this pull request unmergeable. Please resolve the merge conflicts.'.format( # noqa
1491+
state.add_comment(':umbrella: The latest upstream changes{} made this pull request unmergeable. Please resolve the merge conflicts.\n\n*Note that reviewers usually do not review pull requests until merge conflicts are resolved!*'.format( # noqa
14921492
_blame
14931493
))
14941494
state.change_labels(LabelEvent.CONFLICT)

0 commit comments

Comments
 (0)