Conflict resolution ("Take All Right Blocks")

Apologies if this is an obvious question, but I've got a branch which I'm
trying to merge back to the trunk. For whatever reason (probably because
I've not brought one side or other up to date) it's not coming back cleanly,
and is showing several conflicts.

I know the branched version is fine, so I'd like to just do a 'take right'
on the conflicted files, so the branch version with all it's changes is
stamped over the trunk version. However there are no options to do this in
the main UI, and the conflict solver insists that I choose the changes one
by one and resolve them. I can't even do a repeated "next-difference,
take-right-block" because it skips some of the changes (presumably the ones
which have no conflicts). I would need something that goes through all
changes, even auto-merged ones which didn't cause conflicts.

I can do what I need manually by copying the auto-generated
merge-right.r*file over the top of the file and selecting "Mark as
Resolved", but
obviously that's not ideal. It would be nice to have a top level option on
the conflict solver (or even the main UI right click menu for conflicted
files) to select "Take Left File(s)" or "Take Right File(s)".

Any ideas?
Chris Chapman
(Director)
Black Company Studios

[Non-text portions of this message have been removed]

Messages in this topic (1) Reply (via web post) | Start a new topic

.

You want to take the complete right file? Just copy the whole right content
and paste it in the center view.

--
Best regards,
Thomas Singer
_____________
SyntEvo GmbH
www.syntevo.com

&quot;Chris Chapman&quot; < canis.lupus%40gmail.com">canis.lupusgmail.com> wrote:

> Apologies if this is an obvious question, but I've got a branch which I'm
> trying to merge back to the trunk. For whatever reason (probably because
> I've not brought one side or other up to date) it's not coming back cleanly,
> and is showing several conflicts.
>
> I know the branched version is fine, so I'd like to just do a 'take right'
&gt; on the conflicted files, so the branch version with all it's changes is
> stamped over the trunk version. However there are no options to do this in
> the main UI, and the conflict solver insists that I choose the changes one
> by one and resolve them. I can't even do a repeated "next-difference,
> take-right-block"; because it skips some of the changes (presumably the ones
>; which have no conflicts). I would need something that goes through all
> changes, even auto-merged ones which didn't cause conflicts.
>
> I can do what I need manually by copying the auto-generated
> merge-right.r*file over the top of the file and selecting "Mark as
> Resolved&quot;, but
> obviously that's not ideal. It would be nice to have a top level option on
> the conflict solver (or even the main UI right click menu for conflicted
> files) to select "Take Left File(s)&quot; or "Take Right File(s)&quot;.
>
> Any ideas?
&gt; Chris Chapman
> (Director)
> Black Company Studios
>
>
> [Non-text portions of this message have been removed]
>
>
> ------------------------------------
&gt;
> Yahoo! Groups Links
&gt;
>
>
>

Messages in this topic (2) Reply (via web post) | Start a new topic

.

On Mon, Mar 17, 2008 at 4:51 PM, SyntEvo Support
< smartsvn-support%40syntevo.com">smartsvn-supportsyntevo.com> wrote:

> You want to take the complete right file? Just copy the whole right content
> and paste it in the center view.

Hi,

this will work for text files only. If there are conflicts with
binaries (images for example) the conflict solver shows a notification
dialog and quits.

A very nice solution exists in TortoiseSVN: you can solve a conflict
by choosing "take left file" oder "take right file". This works for
text files an binaries of course.

Best regards, Marcus T. Jaschen

Messages in this topic (3) Reply (via web post) | Start a new topic

.