throw new MergeConflictsNotResolvedException("Merge conflicts are not resolved"); reporter.endCommand(); reporter.flush(); throw new MergeConflictsNotResolvedException("merge conflicts exist, please resolve!");
throw new MergeConflictsNotResolvedException("Merge conflicts are not resolved"); reporter.endCommand(); reporter.flush(); throw new MergeConflictsNotResolvedException("merge conflicts exist, please resolve!");
throw new MergeConflictsNotResolvedException("Merge conflicts are not resolved"); reporter.endCommand(); reporter.flush(); throw new MergeConflictsNotResolvedException("merge conflicts exist, please resolve!");