| 27 | Using 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 ...
Get Pragmatic Guide to Subversion now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.
