On Wed, 15 Feb 2006, Katie Capps Parlante wrote:
Also from the Fogel book: "Merging has an important corollary: never commit
the same change twice."
Getting into the regular practice of requiring developers to commit the same
change to 2 branches scares me. Presumably if we avoid omnibus commits, we
could also be merging changes from branch to branch.
Normally, you don't. The change that you know needs to happen on the trunk is
done there first. Then the branch(es) catch(es) up with the trunk.
You commit the same changes multiple times only to branches that are never
going to be merged back into the trunk such as dead-end release branches where
only select fixes are being made.
Andi..
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
Open Source Applications Foundation "Dev" mailing list
http://lists.osafoundation.org/mailman/listinfo/dev
