RE: Merging branches in SVN after converting with cvs2svn
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.user |
|---|---|
| Message-ID | <[email protected]> |
> -----Original Message----- > My question is this: > I had branches in the CVS project that got converted to SVN > branches. However, now in SVN I cannot merge the branches > back to the trunk without old, extraneous files showing up > and causing conflicts. > Christian, I use svn regularly and get some issues with merging and reintegration on occasion. This has mainly to do with my inexperience and there being more than one way of doing it (which is really confusing when getting started). I can give you an answer straight-away, but I'd urge you to search the web for branching/merging strategies in svn. http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk There are people who say always branch of off the trunk, or always merge back where you branched off. I haven't gotten a clear picture and have requested some training on the subject from experts. When I get more info I'll try and share it with you, if I remember. Sorry I can't be more helpful, Chris. ------------------------------------------------------ http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2452135 To unsubscribe from this discussion, e-mail: [[email protected]].