From ed16b4045e724263ea91735ff4fb493979270084 Mon Sep 17 00:00:00 2001 From: Robin Westberg Date: Wed, 18 Mar 2020 10:48:55 +0100 Subject: [PATCH] Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java Co-Authored-By: Erik Duveblad --- bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java b/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java index 496840239..bacbd183a 100644 --- a/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java +++ b/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java @@ -542,7 +542,7 @@ private void addOutdatedComment(List comments) { } var message = "@" + pr.author().userName() + " this pull request can no longer be integrated into " + "`" + pr.targetRef() + "` due to one or more merge conflicts. To resolve these merge conflicts " + - "and update this pull request you can run the following commands:\n" + + "and update this pull request you can run the following commands in the local repository for your personal fork:\n" + "```bash\n" + "git checkout " + pr.sourceRef() + "\n" + "git fetch " + pr.repository().webUrl() + " " + pr.targetRef() + "\n" +