opendev/gerrit
Code Issues Proposed changes

Merge "Allow use theirs merge strategy to snap back to previous commit"

Browse Source
This commit is contained in:
Shawn Pearce
2016-09-18 15:24:24 +00:00
committed by Gerrit Code Review
parent 1f18d57535 b786b937fa
commit b2b65b0e04
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -213,7 +213,8 @@ public class MergeUtil {
PersonIdent committerIndent, String commitMsg, RevWalk rw)
throws IOException, MergeIdenticalTreeException, MergeConflictException {
if (rw.isMergedInto(originalCommit, mergeTip)) {
if (!MergeStrategy.THEIRS.getName().equals(mergeStrategy) &&
rw.isMergedInto(originalCommit, mergeTip)) {
throw new ChangeAlreadyMergedException(
"'" + originalCommit.getName() + "' has already been merged");
}