Re: Update Your Working Copy With Changes From Others

On 26/10/2007, Tanmay <tanmay.pradhan@exilant.com> wrote:
[...]
> I am using tortoisesvn 1.4.5 client (on windows xp).
>
>
>
> In case of any conflicts during an update, the dialog shows the conflicting
> files in red.
>
> I can double click on the line and invoke merge tool to resolve the
> conflict.
>
> If the changes from other user do not conflict (i.e. it's in different line
> of code
>
> from my changes), the tortoisesvn 'automatically' merges those changes.
>
>
>
> Now the question is:
>
> -------------------------------
>
> Is there any update option that allows 'manual' merge in case of
> non-conflicting
>
> file updates?
>
> In other words, I want the merge tool to be invoked similar to conflicting
> scenario;
>
> even in case of non-conflicting update (changes from other user are in
> different lines than mine)?
[...]

http://tortoisesvn.net/node/241

-- 
Milen A. Radev
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org