Eclipse Community Forums: Technology Project and PMC

Help

Home

Home » Eclipse Projects » Technology Project and PMC » CVS merge problem

Show: Today's Messages :: Show Polls :: Message Navigator

CVS merge problem [message #600987]

Fri, 04 August 2006 13:59

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

Report message to a moderator

Previous Topic:	CVS - updating comment
Next Topic:	Designing UI

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Sat Nov 09 01:07:48 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter