Am Mittwoch, 14. Juni 2006 21:24 schrieb Bo Peng: > I think Peter voluntarily applied his patched to the branch since they > are working on similar things, that does not mean it is a good idea to > depart further and further away from trunk though.
I know that Peter did that with good intentions. Nevertheless it would have been better if he (or anybody else) merged completely. > Keeping branches up to data is a hassle and that is why I try to avoid > it whenever possible. (The good thing is that I do not have anything > big enough for a branch.) That is exactly my argument: Keeping branches up to date can be very easy as long as you follow the rule I gave. It can become a hassle if the same parts of the same files are changed in trunk and the branch, but that was not the case here. Georg
