Thursday, January 28, 2010

Subversion merge reintegrate

Reflective/Cyclic Merges

Suppose you are working on a feature branch copied from your trunk.  During the development process you regularly merge ''all'' new changes from trunk to your branch so that the branch stays in "synch" with the work occurring on trunk.  When you eventually merge your branch back to trunk, that is called a reflective (or cyclic) merge.  This type of merge is problematic for Subversion, let's look at why.

There is a blog talking about this problem.

No comments:

Post a Comment