Branch, Merge, Conflict

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.

    I don't them to be done automatically but manually is my problem.

-Ashish
Received on Thu Apr 27 05:10:42 2006