Repository状态在JGit中合并(Repository state Merging in JGit)

 我正在尝试以编程方式解决合并冲突，即强制合并。 解决合并冲突后，如果我尝试提交，我会得到下面的异常： 
 
 
 
 org.eclipse.jgit.api.errors.WrongRepositoryStateException：无法提交到状态为：MERGING的存储库。 
 
 
 如何更改存储库状态或缺少某些内容。 代码片段： 
 
if((RepositoryState.SAFE == pullCommand.getRepository().getRepositoryState())) {
  PullResult result = pullCommand.call();
  if(MergeStatus.CONFLICTING == result.getMergeResult().getMergeStatus()){

     mgCmd = git.merge();
     mgCmd.include(repo.getRef("refs/remotes/origin/development"));
     mgCmd.setStrategy(MergeStrategy.OURS);
     mgCmd.setCommit(true);
     res = mgCmd.call(); 
     System.out.println("Failing Path ==="+res.getFailingPaths());
     pullCommand.getRepository().resolve("C:\\CODE\\thin\\thinclient\\.git");
     if(res.getMergeStatus().equals(MergeResult.MergeStatus.CONFLICTING)){
       System.out.println("Merge status=========+++"+res.getMergeStatus());
     }

I am trying to resolve the merge conflicts programmatically, i.e force merge. After resolving merge conflicts, if i try to commit i get the below exception:
 
 
 
org.eclipse.jgit.api.errors.WrongRepositoryStateException: Cannot commit into a repository with state: MERGING.
 
 
How do I change the repository status or am I missing something. Code snippet: 
 
if((RepositoryState.SAFE == pullCommand.getRepository().getRepositoryState())) {
  PullResult result = pullCommand.call();
  if(MergeStatus.CONFLICTING == result.getMergeResult().getMergeStatus()){

     mgCmd = git.merge();
     mgCmd.include(repo.getRef("refs/remotes/origin/development"));
     mgCmd.setStrategy(MergeStrategy.OURS);
     mgCmd.setCommit(true);
     res = mgCmd.call(); 
     System.out.println("Failing Path ==="+res.getFailingPaths());
     pullCommand.getRepository().resolve("C:\\CODE\\thin\\thinclient\\.git");
     if(res.getMergeStatus().equals(MergeResult.MergeStatus.CONFLICTING)){
       System.out.println("Merge status=========+++"+res.getMergeStatus());
     }

原文：https://stackoverflow.com/questions/43254231