| Merge problem [message #307000] |
Fri, 11 August 2006 01:59  |
Eclipse User |
|
|
|
Originally posted by: marx.nospam_wasko.pl
I did change in branch and in head on the same file.
I switch to HEAD and was trying to merge changes from branch into HEAD.
Eclipse switched to Synchronize View, showed red conflicts, hovewer I
couldn't expand tree with conflicted files.
It writes on the bottom bar that two files are conflicted, but it
doesn't show them in tree.
When i switch from conflicts to incoming mode it shows cross to expand
tree, but when I click it, cross disappears!
It seems like a bug, because it sometimes works ok - I can expand tree,
open diff view, make changes, save and mark as merged.
I tried it on Eclipse 3.2
Any help?
Marx
|
|
|
| Re: Merge problem [message #307282 is a reply to message #307000] |
Thu, 17 August 2006 21:44  |
| Eclipse User |
|
|
|
This sounds like a bug. If you are able to reproduce the problem, you
should log a bug report against Platform/CVS and include your setup and
the steps to reproduce the problem. Before you do so, you may want to
try out the latest 3.2.1 maintenance build to see if the problem has
been fixed already.
Michael
Marx wrote:
> I did change in branch and in head on the same file.
> I switch to HEAD and was trying to merge changes from branch into HEAD.
> Eclipse switched to Synchronize View, showed red conflicts, hovewer I
> couldn't expand tree with conflicted files.
> It writes on the bottom bar that two files are conflicted, but it
> doesn't show them in tree.
> When i switch from conflicts to incoming mode it shows cross to expand
> tree, but when I click it, cross disappears!
> It seems like a bug, because it sometimes works ok - I can expand tree,
> open diff view, make changes, save and mark as merged.
> I tried it on Eclipse 3.2
> Any help?
>
> Marx
|
|
|
Powered by
FUDForum. Page generated in 0.28445 seconds
Home