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

Re: Branch, Merge, Conflict

From: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: 2006-04-28 09:54:42 CEST

On Thursday 27 April 2006 05:09, Ashish Jindal wrote:
> Hi,
>
> Firstly, sorry for cross posting. I am first looking the command line
> argument and then also looking how it can be done thru TortoiseSVN.
>
> I have a typical scenario:
>
> 1. Original code at /project/trunk/File.txt
> 2. Branched code at /branches/br01/File.txt
> 3. I make changes in both the main line and also in the branched line
> (/project and /branches).
> Assume that I make changes at the same locations (line number 2, say
> for example).
> 4. Now, when I want to merge branch into the main line, there's obviously a
> conflict. But I get none!
> Also, while using Tortoise, the updates from branch overwrite the ones
> in main line. How can I manually resolve these conflicts.

This scenario should indeed cause a conflict which needs to be resolved
manually. Since this generally works I propose that you describe *exactly*
what you are doing so that others can try to reproduce your problem.
If you manage to reproduce the error with the svn command line client then
please post the steps to subversion mailing list instead of the tortoisesvn
mailing list.

Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Apr 28 10:01:41 2006

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