Skip to content

Commit

Permalink
Update bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
Browse files Browse the repository at this point in the history
Co-Authored-By: Erik Duveblad <erik.helin@oracle.com>
  • Loading branch information
Robin Westberg and edvbld committed Mar 18, 2020
1 parent 0a14874 commit ed16b40
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -542,7 +542,7 @@ private void addOutdatedComment(List<Comment> 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" +
Expand Down

0 comments on commit ed16b40

Please sign in to comment.