[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] Tortoise -- Merge

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-06-23 19:25:59 CEST

Sean Spratt wrote:

> Thank you very much for your quick response and explaining to me the
> reasoning behind the two step process for resolving conflicts.
>
> In several cases with our project, there exist files that are
> committed into our version control system that are unrelated to test
> and build processes which could be executed on an individual
> developer's machine and as such rely upon server side hooks for
> validation. The tortoise merge program has proved very useful at
> combining much of this work together with some of our less technical
> staff yet, the two step process of resolving conflicts has proved
> repeatively difficult for them to understand.
>
> Is it at all likely that an option would be added to resolve
> conflicts upon saving the merged changes using tortoise merge?
> Perhaps a dialog that jumps straight to the commit phase with the
> recently modified file.

Done in revision 1268.

Stefan

P.S. Do you have some invitations left for GMail? ;)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jun 23 20:32:15 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.