Hiya guys,
My SVN is still rather rusty. I was about to add a note to the changelog
to mention the 6.1.1-pre releases. No big deal for me to add the same
note to both the 6.1.1 branch and trunk.
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?
--
Gerard Beekmans
/* If Linux doesn't have the solution, you have the wrong problem */
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
