Erik wrote:
> Hello again Stefan and Jared,
>
> Thanks for explaining that Stefan, if I understand correctly it is
> like this: Because subversion doesn't store the whole files -only the
> changes- there is nothing to start Word in merge mode with.
> QUESTION: Is that right?
>
Yes.
> The method you described before:
>> You have to use (1) "resolve later" for those files during a merge or chose
>> mine or theirs.
>
>> If you chose "resolve later", then after the merge has finished you can
>> then (2) use the edit-conflicts function (which then uses the merge script).
>
> seems to work fine. I do have a problem here though. Let me try to
> explain:
>
> 1) I start a merge via the Tortoise menu on >one< .docx file in two
> seperate branches
> 2) The merge menu shows me that there are conflicts between the file
> in the two branches so I select the "resolve all later" option
> 3) A number of .rxx files are created
> 4) I then select the "edit conflicts" function from the Tortoise menu
>> on the local file<
> 5) Word 2007 opens the three window merge mode with the local file, a
> file containing differences (presumably from the .rxx files) and in
> the main window a new file that contains the suggested merge with
> "track changes on"
> 6) I accept all changes in the new document and overwrite the local
> file
> 7) I commit the file to the branch
>
> This all seems to work fine but the .rxx files from step 3) remain,
> and I have not been able to verify that all those files were
> represented in step 5.
> QUESTION: Can you confirm that I only have to run the procedure once
> and can then remove all .rxx files?
After resolving the conflict, you have to tell Subversion that you have
in fact resolved the conflict. That's what the menu "mark as resolved"
is for.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-11-22 20:10:38 CET