[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [egit-dev] EGit doesn't enter "Conflicts" mode after conflicting merge

Stefan Rademacher wrote:
> 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.

Is the merge result "Conflicts" or "Failed"? It can be Failed and also
have conflicting files. Because if it is the latter, maybe you've been
bitten by this JGit merge bug:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=354099

The fix for this bug is unfortunately too late for 2.0, but as soon
as it's in master, you could try a nightly and see if that fixes it.

> 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?
> 
> Best regards!
> Stefan
> _______________________________________________
> egit-dev mailing list
> egit-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/egit-dev