I'm probably very impatient, but I would really like it if someone
could point me in the right direction, I'm stuck on the issue!
Has the fact that the "resolve conflict" buttons aren't shown anything
to do with the merge-docx.js script, or not?
If so, what can I change in the script to make them appear?
Erik
On Nov 19, 3:05 pm, Erik <mr.eri..._at_gmail.com> wrote:
> Hello all,
>
> I've been trying to use subversion and tortoise to merge my Word
> 2007 .docx files and ran into some difficulties.
>
> The default diff functionality works fine > it starts Word in "diff"
> mode with both files loaded.
>
> However, the default merge-docx.js script does not seem to work. When
> I try to merge two files from two different branches tortoise tells me
> there is a conflict, but the "resolve conflict" buttons are not
> available (both "edit conflict" and "resolved" are greyed out).
>
> I would expect the buttons to be available and to start word 2007 in
> Merge mode. I've seen on the Microsoft developer site that there are
> methods that can be called (MergeDocuments), but I'm not familiar with
> scripting and don't know how to adjust the merge-docx.js file so it
> works.
>
> Is there anyone that can help me? Thanks in advance!
>
> Greetings,
> Erik
>
> P.S. I've installed the latest nightly build and also tried searching
> on this topic in the archive, but with no results.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-21 09:01:42 CET