Login | Register
My pages Projects Community openCollabNet

Discussions > dev > [TSVN] TortoiseMerge: Editing conflicts

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

tortoisesvn
Discussion topic

Back to topic list

[TSVN] TortoiseMerge: Editing conflicts

Author deccles
Full name Dave Eccleston
Date 2004-09-22 10:44:43 PDT
Message I absolutely love the three-panel view for resolving conflicts in
TortoiseSVN. However, sometimes it is not appropriate to pick theirs or
yours, but you want a combination of both. It would be nice if
TortoiseMerge would allow a user to enter arbitrary text as the result
of conflict resolution.

Thanks,
Dave


--------------------​--------------------​--------------------​---------
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 44 | Next message in topic »

Messages

Show all messages in topic

[TSVN] TortoiseMerge: Editing conflicts deccles Dave Eccleston 2004-09-22 10:44:43 PDT
     [TSVN] Re: TortoiseMerge: Editing conflicts Simon Large <slarge at blazepoint dot co dot uk> Simon Large <slarge at blazepoint dot co dot uk> 2004-09-23 01:26:22 PDT
         Re: [TSVN] Re: TortoiseMerge: Editing conflicts deccles Dave Eccleston 2004-09-24 08:43:46 PDT
             RE: [TSVN] Re: TortoiseMerge: Editing conflicts kientzle Tim Kientzle 2004-09-24 08:51:41 PDT
                 [TSVN] Re: Re: TortoiseMerge: Editing conflicts Simon Large <slarge at blazepoint dot co dot uk> Simon Large <slarge at blazepoint dot co dot uk> 2004-09-27 01:49:44 PDT
                     RE: [TSVN] Re: Re: TortoiseMerge: Editing conflicts "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> 2004-09-27 02:54:30 PDT
             Re: [TSVN] Re: TortoiseMerge: Editing conflicts saber850 Nick G. 2004-09-24 09:14:13 PDT
                 RE: [TSVN] Re: TortoiseMerge: Editing conflicts "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> 2004-09-24 09:15:32 PDT
                     RE: [TSVN] Re: TortoiseMerge: Editing conflicts saber850 Nick G. 2004-09-24 11:16:35 PDT
                     Re: [TSVN] Re: TortoiseMerge: Editing conflicts SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-09-26 01:52:23 PDT
                 Re: [TSVN] Re: TortoiseMerge: Editing conflicts Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-09-24 10:44:05 PDT
                     Re: [TSVN] Re: TortoiseMerge: Editing conflicts saber850 Nick G. 2004-09-24 11:50:19 PDT
                         Re: [TSVN] Re: TortoiseMerge: Editing conflicts Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-09-24 12:01:07 PDT
                             Re: [TSVN] Re: TortoiseMerge: Editing conflicts saber850 Nick G. 2004-09-24 12:50:04 PDT
                                 Re: [TSVN] Re: TortoiseMerge: Editing conflicts Mark Phippard <MarkP at softlanding dot com> Mark Phippard <MarkP at softlanding dot com> 2004-09-24 12:47:04 PDT
                                     [TSVN] Re: Suspect: (SYB)Re: [TSVN] Re: TortoiseMerge: Editing conflicts saber850 Nick G. 2004-09-24 13:40:05 PDT
                         Re: [TSVN] Re: TortoiseMerge: Editing conflicts SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-09-26 02:06:24 PDT
                     Re: [TSVN] Re: TortoiseMerge: Editing conflicts SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-09-26 01:57:24 PDT
                 Re: [TSVN] Re: TortoiseMerge: Editing conflicts SteveKing <steveking at gmx dot ch> SteveKing <steveking at gmx dot ch> 2004-09-26 01:50:51 PDT
                     Re: [TSVN] Re: TortoiseMerge: Editing conflicts saber850 Nick G. 2004-09-27 08:28:42 PDT
                     Re: [TSVN] Re: TortoiseMerge: Editing conflicts Tristan Seligmann <tristan at quotemaster dot co dot za> Tristan Seligmann <tristan at quotemaster dot co dot za> 2004-09-29 07:19:16 PDT
             [TSVN] Re: Re: TortoiseMerge: Editing conflicts Simon Large <slarge at blazepoint dot co dot uk> Simon Large <slarge at blazepoint dot co dot uk> 2004-09-24 09:13:37 PDT
                 Re: [TSVN] Re: Re: TortoiseMerge: Editing conflicts deccles Dave Eccleston 2004-09-26 21:17:20 PDT
                     [TSVN] Re: Re: Re: TortoiseMerge: Editing conflicts Simon Large <slarge at blazepoint dot co dot uk> Simon Large <slarge at blazepoint dot co dot uk> 2004-09-27 02:40:15 PDT
                         RE: [TSVN] Re: Re: TortoiseMerge: Editing conflicts "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> "Hughes, Bill" <Bill dot Hughes at cox dot co dot uk> 2004-09-27 03:02:33 PDT
Page: of 2 « Previous | Next »
Messages per page: