Why is test merge different than actual?
Greg Creager <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.tortoisesvn.devel |
|---|---|
| Message-ID | <778711174.4688.1473444380915.JavaMail.httpd@localhost> |
So we had a test merge to reintegrate a branch that was showing all kinds of conflicts and things we were not expecting (things we already handled on a rebase). Was very confused by what it was showing, yet when I did the actual merge none of those conflicts or changes I was confused by took place, it was as if it was using a different algorithm for the test merge. ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3185317 To unsubscribe from this discussion, e-mail: [[email protected]].