"Marc Batchelor" <mbatchelor@pentaho.org> wrote on 08/08/2006 10:47:03 AM:
> OK, I found out what I needed to do. For the Edit Conflicts to show up,
I
> needed to do a Team->Update on the folder that contained the known merge
> conflict. This changed the Icon on the offending file from '*' to 'x'
which
> then allowed me to Edit Conflicts which produced the external editor.
>
> Sorry for the confusion - that is a usage pattern we never use.
>
> What our engineers do is go to the root folder of the project,
Right-Click
> and choose Team->Synchronize. Then, for all the merge conflicts that
show up
> there, they expect to be able to merge using the defined Merge tool. I
do
> think this is a reasonable expectation, and a reasonable usage pattern,
but
> unfortunately, without doing the Team->Update, you can't merge.
You can use that usage pattern, you just cannot use an external editor.
With that scenario, you have to use the Eclipse merge, save the results
locally. And then do the "Mark as Merged" option.
I personally use Synchrnonize to get an idea of what is going to happen. I
then just let Subversion do it all by doing Team -> Update from the root.
If it cannot auto-merge any of the changes, I can then use Edit Conflicts
to resolve the parts it could not handle automatically.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Tue Aug 8 16:51:20 2006