Search Results

Search found 1 results on 1 pages for 'tbreffni'.

Page 1/1 | 1 

  • Choosing Merge Direction

    - by tbreffni
    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?

    Read the article

1