Merge pull request #146 from fee1-dead/patch-1

Mark-Simulacrum · web-flow · commit ac9256e5dd52 · 2021-07-03T12:06:18.000-04:00
Updated anchor of link to rustc dev guide
diff --git a/homu/main.py b/homu/main.py
@@ -1554,7 +1554,7 @@ def fetch_mergeability(mergeable_que):
                 state.add_comment(
                     ':umbrella: The latest upstream changes{} made this '
                     'pull request unmergeable. Please [resolve the merge conflicts]'  # noqa
-                    '(https://rustc-dev-guide.rust-lang.org/git.html#conflicts).'  # noqa
+                    '(https://rustc-dev-guide.rust-lang.org/git.html#rebasing-and-conflicts).'  # noqa
                     .format(_blame)
                 )
                 state.change_labels(LabelEvent.CONFLICT)

Original file line number	Diff line number	Diff line change
`@@ -1554,7 +1554,7 @@ def fetch_mergeability(mergeable_que):`
`1554`	`1554`	`state.add_comment(`
`1555`	`1555`	`':umbrella: The latest upstream changes{} made this '`
`1556`	`1556`	`'pull request unmergeable. Please [resolve the merge conflicts]' # noqa`
`1557`		`- '(https://rustc-dev-guide.rust-lang.org/git.html#conflicts).' # noqa`
	`1557`	`+ '(https://rustc-dev-guide.rust-lang.org/git.html#rebasing-and-conflicts).' # noqa`
`1558`	`1558`	`.format(_blame)`
`1559`	`1559`	`)`
`1560`	`1560`	`state.change_labels(LabelEvent.CONFLICT)`