Hi Julia, thanks for your status update.
I did merging today and I didn't have any conflicts. I wanted to do it after finishing reading. But I don't known when the best time for merging — when I finish some part of project or when HelenOS team make some updates.
Like I have already written, merging regularly with a reasonable period (say one week or two weeks) is optimal for HelenOS. Even if you encounter some conflicts after one week, it is very likely that with our current development pace there won't be a lot of them and they will be easy to fix.
The point is to avoid having two branches which might have diverged a month ago or even later, with lots of conflicts and lots of changes you are unfamiliar with. Such a late merging might be quite unpleasant.
And of course, always use the common sense. There is obviously no reason to merge from mainline if nothing has changed in the mainline since the last merge. Also, if you are just in the middle of debugging of some complex feature in your branch, you should not distract yourself with merging. Just finish your feature and merge afterwards.
M.D. _______________________________________________ HelenOS-devel mailing list [email protected] http://lists.modry.cz/cgi-bin/listinfo/helenos-devel
