Choosing Merge Direction
Posted
by tbreffni
on Stack Overflow
See other posts from Stack Overflow
or by tbreffni
Published on 2010-02-22T22:19:26Z
Indexed on
2010/04/01
6:23 UTC
Read the original article
Hit count: 264
Consider a simple source-control layout, with a trunk representing a future release in development and a single branch representing a release currently in production.
When a bug is discovered that needs fixed in both branches, should the change be made first to the trunk then merged down to the branch, or made first to the branch then merged up to the trunk? Typically I've made the fix first in the trunk then merged downwards, however there is an increased risk this way that future new features get merged down accidentally. What has worked best in your experience?
© Stack Overflow or respective owner