RevCommit newCommit = report.getMergeCommit(); importResult.setNewCommit(newCommit);
&& result.getMergeReport().get().getReport().isPresent()) { MergeReport report = result.getMergeReport().get(); writeMergeResponse(Optional.fromNullable(report.getMergeCommit()), report.getReport().get(), report.getOurs(), report.getPairs().get(0).getTheirs(), report.getPairs().get(0).getAncestor());
MergeReport result = new MergeReport(mergeCommit, Optional.fromNullable(mergeScenario), oursId, pairs);
return new MergeReport(mergeCommit, Optional.fromNullable(mergeScenario), oursId, pairs);
RevCommit newCommit = report.getMergeCommit(); importResult.newCommit = newCommit;
.setMessage("My merge message.").call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
.setMessage("My merge message.").call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
.setMessage("My merge message.").call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
.setMessage("My merge message.").call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
.addCommit(branch1.getObjectId()).call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
.setMessage("My merge message.").call(); RevCommit mergeCommit = mergeReport.getMergeCommit();
.setMessage("My merge message.").call(); RevCommit mergeCommit = mergeReport.getMergeCommit();
.setNewValue(report.getMergeCommit().getId()).call(); assertFalse(report.getMergeCommit().getId().equals(logged.get(0).getId())); parent1Id = report.getMergeCommit().getParentIds().get(0); parent2Id = report.getMergeCommit().getParentIds().get(1);
.addCommit(branch1.getObjectId()).call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
return; commit = report.getMergeCommit(); } catch (RuntimeException e) { if (e instanceof NothingToCommitException || e instanceof IllegalArgumentException
return; commit = report.getMergeCommit(); } catch (RuntimeException e) { if (e instanceof NothingToCommitException || e instanceof IllegalArgumentException
.setLeft(report.getMergeCommit()).setRight(commit10).call();
.setNewValue(report.getMergeCommit().getId()).call(); assertFalse(report.getMergeCommit().getId().equals(logged.get(0).getId())); parent1Id = report.getMergeCommit().getParentIds().get(0); parent2Id = report.getMergeCommit().getParentIds().get(1);
progress.setDescription("Merge successful"); MergeReport mergeReport = pullResult.getMergeReport().get(); mergeScenarioReport = mergeReport.getReport().orNull(); RevCommit commit = mergeReport.getMergeCommit();
.setLeft(report.getMergeCommit()).setRight(commit10).call();