Subversion Branch Merge Tutorial

[JefGoines]

Thx very helpful!

[brook2th]

Thx dude ur video is really helpful

[mcmagi]

Thanks for posting these instructions! This is exactly what I was looking for to perform a merge.

[sjwdavies]

Hi.... I thought I got this but after rewatching it I'm confused. The video starts with the branch, tag, trunk view - is this the repository root on the server? The branch then copied from the trunk, again on the server repo? Then the branch is checked out to allow work to commence?? So a normal 'working copy' of the repo would contain all branches, and all work as it gets committed to each branch?

[jokumusic]

Why did you create a branch in the branches directory and then make a "working copy" in the projects directory. Couldn't you just use the project in the branches directory as your working copy?

[sharperguy]

@jokumusic You need to work on a separate working copy from what's stored on the server, otherwise the files won't be version controlled. You wouldn't be committing and wouldn't be able to roll-back etc. The server might also be on another machine somewhere making it slow.

[GBUKMilo]

Awesome, thanks for that, also the captions are hilarious.

[Lzryde]

@GBUKMilo Fuck yeah, 3:53, captions say "Type that shit" lmao