Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Technology Project and PMC » CVS merge problem
CVS merge problem [message #600987] Fri, 04 August 2006 09:59
Marx is currently offline Marx
Messages: 21
Registered: July 2009
Junior Member
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
Previous Topic:CVS - updating comment
Next Topic:Designing UI
Goto Forum:
  


Current Time: Fri Aug 22 19:35:21 EDT 2014

Powered by FUDForum. Page generated in 0.16118 seconds