opendev/gerrit
Code Issues Proposed changes

Recommend rebase on Path Conflict

Browse Source 
The current message on path conflict says that the author should
"merge (or rebase) the change".

Because of this many users that are new to Git and Gerrit do a
'git merge' when they get this message. As result they end up with two
commits (the commit that implements the change + the merge commit).
After push there is now a second change for the merge commit.

However the intention of the author was to rebase the change and upload
the rebased commit as a new patch set to the change.

This is why the message on path conflict should clearly recommend to do
a 'git rebase' and not a 'git merge' to resolve the conflict.

Change-Id: I340fd22ffe5be893e57a5fb2430f2c590fc328b9
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2012-11-24 09:58:49 +01:00
parent f94d40de66
commit 51a81aac22
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
View File

@@ -30,7 +30,7 @@ enum CommitMergeStatus {
/** */
PATH_CONFLICT("Your change could not be merged due to a path conflict.\n"
+ "\n"
+ "Please merge (or rebase) the change locally and upload the resolution for review."),
+ "Please rebase the change locally and upload the rebased commit for review."),
/** */
MISSING_DEPENDENCY(""),