Login | Register
My pages Projects Community openCollabNet

Discussions > dev > [TSVN] Resolving Conflicts

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

[TSVN] Resolving Conflicts

Author Will Gayther <willgayther at yahoo dot com>
Full name Will Gayther <willgayther at yahoo dot com>
Date 2004-07-23 13:33:24 PDT
Message I'm sorry for what will probably seem to you guys like
a stupid question.

But I CANNOT figure out how to merge to conflicting
versions!

I am used to using CVS. The TortoiseSVN documentation
says "You can either launch an external merge tool /
conflict editor with the Edit Conflict context menu".
I cannot find any "Edit Conflict" context menu
anywhere.

To finish my changes, the documentation says
"Afterwards execute the command Resolved from the
context menu and commit your modifications to the
repository." Again, I cannot find a context menu with
"Resolve" on it anywhere.

I've tried doing a "diff" on the file from the
TortoiseSVN context menu (the only "context menu" I
can find). I use WinMerge to do the diff, but when I
try to save I just get an error message saying "...is
marked read-only. Would you like to ssave the file
under a different name?")

You guys are obviously using it just fine - what am I
missing? Where is this hidden context menu that the
docs refer to?

--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: dev-unsubscribe@tort​oisesvn.tigris.org
For additional commands, e-mail: dev-help at tortoisesvn dot tigris dot org

« Previous message in topic | 1 of 40 | Next message in topic »

Messages

Show all messages in topic

[TSVN] Resolving Conflicts Will Gayther <willgayther at yahoo dot com> Will Gayther <willgayther at yahoo dot com> 2004-07-23 13:33:24 PDT
     Re: [TSVN] Resolving Conflicts SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-07-23 13:48:21 PDT
         Re: [TSVN] Resolving Conflicts Alan Jay Weiner <alan at ajw dot com> Alan Jay Weiner <alan at ajw dot com> 2004-07-23 20:06:44 PDT
             Re: [TSVN] Resolving Conflicts SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-07-24 01:01:36 PDT
                 Re: [TSVN] Add to ignore list SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-07-24 01:06:47 PDT
                     RE: [TSVN] Add to ignore list Maarten | AI <mjvdveen at ai dot rug dot nl> Maarten | AI <mjvdveen at ai dot rug dot nl> 2004-07-24 01:29:04 PDT
                         Re: [TSVN] Add to ignore list SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-07-24 01:48:44 PDT
                     RE: [TSVN] Add to ignore list Norbert Unterberg <nepo at gmx dot net> Norbert Unterberg <nepo at gmx dot net> 2004-07-24 01:58:50 PDT
                         Re: [TSVN] Add to ignore list SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-07-26 12:36:40 PDT
                             [TSVN] UNICODE support in folder names rolfik Marek 2004-07-27 01:58:20 PDT
                                 RE: [TSVN] Add to ignore list "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> 2004-07-27 02:00:31 PDT
                                 Re: [TSVN] UNICODE support in folder names =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> 2004-07-27 05:28:08 PDT
                                     RE: [TSVN] UNICODE support in folder names rolfik Marek 2004-07-27 06:03:26 PDT
                                         Re: [TSVN] UNICODE support in folder names =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> 2004-07-27 06:09:58 PDT
                                             RE: [TSVN] UNICODE support in folder names rolfik Marek 2004-07-27 06:25:08 PDT
                                                 Re: [TSVN] UNICODE support in folder names =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> 2004-07-27 06:35:28 PDT
                                                     RE: [TSVN] UNICODE support in folder names rolfik Marek 2004-07-27 06:49:20 PDT
                                                         Re: [TSVN] UNICODE support in folder names =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> 2004-07-27 06:53:56 PDT
                                                             RE: [TSVN] UNICODE support in folder names rolfik Marek 2004-07-27 23:35:57 PDT
                                                                 Re: [TSVN] UNICODE support in folder names =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> =?ISO-8859-2?Q?Stefan_K=FCng?= <stefan dot kueng at wagner-group dot ch> 2004-07-27 23:40:41 PDT
                                                     RE: [TSVN] UNICODE support in folder names Norbert Unterberg <nepo at gmx dot net> Norbert Unterberg <nepo at gmx dot net> 2004-07-27 10:27:08 PDT
                                                         Re: [TSVN] UNICODE support in folder names SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-07-27 11:20:42 PDT
                                                             RE: [TSVN] UNICODE support in folder names Norbert Unterberg <nepo at gmx dot net> Norbert Unterberg <nepo at gmx dot net> 2004-07-27 11:58:43 PDT
                                                                 Re: [TSVN] UNICODE support in folder names SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-07-27 12:04:36 PDT
                                                                     RE: [TSVN] UNICODE support in folder names boris_m Boris Musa 2004-07-27 15:16:15 PDT
Page: of 2 « Previous | Next »
Messages per page: