RE: Problems with merging
[email protected] Wed, 6 Jan 2010 06:01:14 -0800 (PST)
| Newsgroups | gmane.comp.version-control.subversion.rapidsvn.user |
|---|---|
| Message-ID | <2226549.18217.1262786474084.JavaMail.httpd@localhost> |
I've finally figured the merging out. I thought the Merge dialog was asking for two files to merge together and a third for the output. What is actually doing is doing a diff on the two specified files/versions and applying that diff to the given output file. If there are no problems, there is no merge dialog to show. If there is a difficulty the file shows as conflicted and then the interactive resolve will bring up the merge tool. ------------------------------------------------------ http://rapidsvn.tigris.org/ds/viewMessage.do?dsForumId=671&dsMessageId=2435165 To unsubscribe from this discussion, e-mail: [[email protected]].