Re: [TSVN] Auto merge not wanted, how can it be turned off?

Eric J. Smith wrote:

> In your sample the same developer would have to also change the line at the
> bottom of the function since he changed the name of the variable. So in
> your case it would've caused a merge conflict and you would need to resolve
> it manually.

original:
{
   int foo;
   foo=5;
   println(foo);

   //some more lines of code not touching foo
}

dev 1's commit:
{
   int index;
   index=5;
   println(index);

   //some more lines of code not touching foo
}

dev 2's commit:
{
   int foo;
   foo=5;
   println(foo);

   //some more lines of code not touching foo

   delete(foo);
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 18 09:49:39 2004