| Chunk |
|---|
| Conflicting content |
|---|
=======
project.setResult(Result.UNSTABLE);
RebaseAction rebaseAction = new RebaseAction(project);
long result = rebaseAction.perform(listener,new RebaseSetting(permalink));
if(result<0){
<<<<<<< HEAD
build.setResult(Result.UNSTABLE);
>>>>>>> 7c9bf0ab95c6e3abfb1d24da6820b6bec3101e4c
}
return !stopBuildIfMergeFails || result >= 0;
} |
| Solution content |
|---|
RebaseAction rebaseAction = new RebaseAction(project);
long result = rebaseAction.perform(listener,new RebaseSetting(permalink));
if(result<0){
build.setResult(Result.UNSTABLE);
}
return !stopBuildIfMergeFails || result >= 0;
} |
| File |
|---|
| RebaseBuilder.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |