Skip to Main Content
Pragmatic Guide to Subversion
book

Pragmatic Guide to Subversion

by Mike Mason
November 2010
Intermediate to advanced content levelIntermediate to advanced
150 pages
2h 55m
English
Pragmatic Bookshelf
Content preview from Pragmatic Guide to Subversion
26Merging Changes from Trunk to Branch

When stabilizing your code ready for release, it’s best to fix bugs on the trunk and then merge the fixes to the branch. If you do things the other way around, you might forget to merge a fix back to the trunk, and it will show up as a regression in your next release.

Fix the bug on the trunk, and note the revision number where the fix was checked in. In a branch working copy, merge the revision or revisions from the trunk. In most cases, the merge will work automatically without any conflicts. The merge works kind of like an update; think of the branch as an old working copy that needs to incorporate new changes from the trunk to keep it up-to-date. If the trunk and the branch have diverged, though, ...

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Start your free trial

You might also like

Reinventing the Organization for GenAI and LLMs

Reinventing the Organization for GenAI and LLMs

Ethan Mollick

Publisher Resources

ISBN: 9781680500035Errata Page