From 6df7e5cdf9522270ceb1240afae4ce1885c4d6ac Mon Sep 17 00:00:00 2001
From: Camelid <camelidcamel@gmail.com>
Date: Tue, 29 Sep 2020 15:13:30 -0700
Subject: [PATCH] Link to Git guide in rustc-dev-guide on merge conflicts

---
 homu/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homu/main.py b/homu/main.py
index e55ceee..c4b3b9c 100644
--- a/homu/main.py
+++ b/homu/main.py
@@ -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 '