Repository state Merging in JGit - jgit

Question

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());
}

Answer 1

The MergeCommand is not meant to resolve merge conflicts. The contrary is true, it will cause merge conflicts if the included ref(s) cannot be merged without conflicts.
The PullCommand is a composite command that first fetches commits from upstream and then tries to merge them using the MergeCommand.
In order to programmatically resolve merge conflicts, you need to change files in the local work directory accordingly, add them to the index, and then issue a merge commit.
Information about conflicting files can be found in pullResult.getMergeResult(). A merge commit can be created with the regular CommitCommand.