Georg Baum wrote: > I just wanted to do Abdel a favour and merged my latest changes to his > branch. I discovered that it already included Peters latest changes, but > e.g. not the latest scons work by Bo. > That makes working with branches more difficult than it should be, so > please follow this simple rule: > > If you merge something to a branch that is intended to follow the trunk, > merge everything up to the desired revision, and not only parts of it. > > If you don't know how to do that: One possible way is explained at > http://wiki.lyx.org/devel/pmwiki.php/DevelTips/Branches > > I believe that Abdels branch is now in sync with revision 14109 of trunk, > but am not sure. > > > Georg > >
I think the only branches I have to care about is my own and trunk. And when a update someone other branch it is just niceness to the owner of this branch, because he is responsible for his branch. I also think when I use some else branch and get problems then it is my problem, because as I understand it, in my branch I could do all what I want to, and don't have to care about the rest of the world, because of this it is a personal branch. (But maybe I'm wrong here.) And when someone plan to merge his branch with trunk then it is his job to update his branch, he could ask for help, but finally he is responsible for updating his branch. Peter
