Jeff Bowden wrote:
>> I realize some people really like the Synch view, I am just not one of
>> them. I do not like it with CVS either, but I think our dialogs are
>> better
>> than CVS in that they show more info. So I can see more why you would
>> want
>> it with CVS.
>
> Is the sync view also supposed to be the primary place for resolving
> conflicting changes? I've tried to use it for that but the workflow
> seems unreasonably awkward. I've never used the CVS integration so I
> have no idea if this this suclipse's fault or if the feature is just
> poorly designed.
Not sure about Subclipse, but with CVS you double-click on conflicted
resource and get diff editor where you can review/accept/copy/modify
changes (this is actually just local changes and not really related to
SVN). Once you done with the editor you save changes and choose "Mark as
Merged" acton in Sunch view. Then you ready to commit your change or can
continue working on local changes. Actually, with CVS the same merge
"workflow" is applicable to merging branches.
regards,
Eugene
Received on Wed May 18 13:20:58 2005