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

[Robin Stocker <robin@xxxxxxxxx>]

Stefan Rademacher wrote:
> Hi all,
> 
> I tried the rc2 this morning and still have the same issue, described
> below.
> I know, that it's all very busy now, short before the Juno-Release,
> but I would appreciate a short comment on this.
> 
> Am I the only one, who has this issue with "merge" in EGit?

I tried it just now and couldn't reproduce it. The repository is
in "Conflicts" state and the Merge Tool is available from
the Staging View as well as in the Team menu.

Is there something special about your repository? Is there a
MERGE_HEAD file in the .git directory of the repository after
you have pulled? Is there any error in the Error Log?

Could you please file a bug report about this and provide the
information there.

Regards,
  Robin

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