Make merge failure error messages consistent
Change-Id: I9f33fc629587e7b03863d7b3a1f6ed8051d9e56d
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
index ef2bc2b..3d3d9b1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
@@ -28,13 +28,13 @@
ALREADY_MERGED(""),
/** */
- PATH_CONFLICT("The change could not be merged due to a path conflict.\n"
+ PATH_CONFLICT("Change could not be merged due to a path conflict.\n"
+ "\n"
+ "Please rebase the change locally and upload the rebased commit for review."),
/** */
REBASE_MERGE_CONFLICT(
- "The change could not be merged due to a conflict.\n"
+ "Change could not be merged due to a conflict.\n"
+ "\n"
+ "Please rebase the change locally and upload the rebased commit for review."),
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index ba38f8f..e4c6e0a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -452,7 +452,7 @@
for (ChangeData cd : queryProvider.get().submitted(destBranch)) {
try {
Change c = cd.change();
- setNew(c, message(c, "Your change could not be merged, "
+ setNew(c, message(c, "Change could not be merged, "
+ "because the destination branch does not exist anymore."));
} catch (OrmException e) {
log.error("Error setting change new", e);
