[TSVN] Re: Re: Re: TortoiseMerge: Editing conflicts

"Dave Eccleston" wrote

>>> The need to edit conflicts comes up about half the time.

>> Another pertinent question might be: why do you get conflicts half the
time?

> I said "the need to edit" comes up half the time.

Sorry, I misread you.

> You should resist the urge to get preachy and quote stuff at people.
> It's irritating, and you were wrong about what I meant anyway.

That was not the intention. OK, I got it wrong this time, but I was quoting
to emphasise that fact that it was not my personal feelings. People do come
to this list with exactly that problem - 2 developers not talking to each
other, hacking at the same bit of code and then wondering why they get so
many conflicts.

Anyway, glad you found a satisfactory solution to the merge/edit problem.

Cheers,

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 27 12:26:38 2004