How to get conflicting lines with JGit
<p>I'm developing the application, in which JGit is used.</p>

<p>After a pull, I have conflicting files. I can get it from </p>

<pre class="lang-java prettyprint-override"><code>List&lt;String&gt; list = git.status().call().getConflicting();
</code></pre>

<p>The list contains files in conflict.</p>

<p>I know, that I can get conflicting files from</p>

<pre class="lang-java prettyprint-override"><code>Map&lt;String, int[][]&gt; conflicts = git.pull().call().getMergeResult().getConflicts();
</code></pre>

<p>but it doesn't work if I restart my application. After the restart, I will have an empty map because I'm not able to redo the pull when the repository is in merging state.</p>

<p>How can I get conflicting lines by the name of file via JGit API?</p>