RE: Problems with merging
[email protected] Tue, 5 Jan 2010 04:36:29 -0800 (PST)
| Newsgroups | gmane.comp.version-control.subversion.rapidsvn.user |
|---|---|
| Message-ID | <15026838.16438.1262694989590.JavaMail.httpd@localhost> |
I've done a bit more evaluation. The Merge tool (specified in the options) is only used when performing an interactive resolve command. i.e. Two users make conflicting changes, when the second tries to commit, they need to do an interactive resolve before committing. This displays the merge tool. The other merge operations (File Log -> Merge, Repository -> Merge) seem to use some SVN client library to perform a merge but it seems to just pick one version. So it appears Merge doesn't do a merge but Resolve does! It would be good if you could configure the client to use the Merge tool for merge operations! RapidSVN v0.12 doesn't seem to support merging trunks/branches ------------------------------------------------------ http://rapidsvn.tigris.org/ds/viewMessage.do?dsForumId=671&dsMessageId=2434880 To unsubscribe from this discussion, e-mail: [[email protected]].