Package playRepository

Examples of playRepository.GitConflicts$Conflict

685
686
687
688
689
690
691
692
693
694
695
                        .getRef(org.eclipse.jgit.lib.Constants.HEAD).getObjectId().getName();
                MergeResult mergeResult = GitRepository.merge(clonedRepository,
                        cloneAndFetch.getDestFromBranchName());

                if (mergeResult.getMergeStatus() == MergeResult.MergeStatus.CONFLICTING) {
                    pullRequestMergeResult.setGitConflicts(new GitConflicts(clonedRepository, mergeResult));
                    pullRequestMergeResult.setConflictStateOfPullRequest();
                } else if (mergeResult.getMergeStatus().isSuccessful()) {
                    String mergedCommitIdTo = mergeResult.getNewHead().getName();
                    pullRequest.mergedCommitIdFrom = mergedCommitIdFrom;
                    pullRequest.mergedCommitIdTo = mergedCommitIdTo;
View Full Code Here
TOP

Related Classes of playRepository.GitConflicts$Conflict

  • models.PullRequest
  • org.eclipse.jgit.lib.ObjectId
  • org.eclipse.jgit.revwalk.RevWalk
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.