Re: [egit-dev] EGit doesn't enter "Conflicts" mode after conflicting mer

[Matthias Sohn <matthias.sohn@xxxxxxxxxxxxxx>]

2012/5/16 Stefan Rademacher <Rademacher@xxxxxxx>

Hello all,

 

I am working with the current 2.0.0 nightly build and have the following problem:

Whenever I execute "Pull", and the incoming commits cannot automatically be merged with my local ones, EGit shows the conflicting files, but doesn't enter the "Conflicts" mode. Consequently the "Merge Tool..." button stays disabled, and I can't complete the merge in a proper way.

 

My current workaround is to call "git pull" from the commandline. Then EGit correctly recognizes, that there are conflicts to be resolved, which I do by opening the Merge Tool.

 

Is this already a known issue or am I doing something wrong?

could you provide step by step instructions how to reproduce your problem,

ideally using some public repository 

-- 
Matthias