|CVS merge problem [message #600987]
||Fri, 04 August 2006 13:59
Registered: July 2009
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
Powered by FUDForum
. Page generated in 0.01798 seconds