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
27Using Change Tracking

Sometimes a team will use a feature branch to work on a major change that might be disruptive to developers working on the trunk. The work can proceed safely on the branch, and when completed, the changes are merged to the trunk, and the branch is deleted.

A feature might take a while to complete, increasing the risk that the trunk and the feature branch diverge and making the impending “merge to trunk” more difficult. Developers working on the branch might choose to periodically pull changes from the trunk to the feature branch in order to reduce this risk, a technique known as rebasing. Subversion’s merge tracking feature allows us to automatically merge any trunk changes to a branch that have not previously been ...

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