On Wed, Nov 23, 2005 at 02:22:02PM -0700, Gerard Beekmans wrote: > > But there must be a nice way to merge changes from the 6.1.1 branch back > to trunk so they are kept in sync. I can understand that sometimes > merging will fail if changes are made in both branch and trunk that make > a merge not possible. In those cases we're back to manually adding > things to both books?
Trunk and the 6.1.1 may very well not be close enough to merge. In this case, duplication would be the foolproof method. -- Archaic Want control, education, and security from your operating system? Hardened Linux From Scratch http://www.linuxfromscratch.org/hlfs -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
