Description Bouchet Stéphane 2015-12-03 12:16:54 EST

Hi,

i had faced a problem that take me some time to resolve.

Symptoms are that a conflict cannot be displayed using the mergeTool action. 
A double click/ usage of mergeTool action on the file was just displaying a blank editor.

After some debug on the code, i found that the parent folder of the conflicting resource was listed on the .gitignore, resulting on an empty difNode ! ( using the use workspace preference for merge ...) 

from [1], when the user select the mergetool action, the diffnode construction filters the contents of the ignored folder dure to filter on line 282 , resulting to a empty diffnode.

A solution could be to remove the ignored resources when using the mergetool with "use workspace" merge preference, or do not display the conflict which is disturbing because egit can still "see" modification on tracked files on the ignored folder.

that a separate use case but the conflict result of a modification on the file that was pushed: ignoring a folder with previously tracked file still shows them in the staging view ...



[1] https://github.com/eclipse/egit/blob/master/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java#L266