Le jeudi 15 mars, Georg S. Weber a écrit: > <many things> What I would like to point out is :
(1) current situation : I base my work on rel1, and when I'm happy with it, learn that there is a rel2 which is rel1+patch1+...+patch100, with seven conflicts, and I should rebase. (2) a proper source management system is used : I base my work on the current state of the art which is already rel1+patch1+...+patch70, so when I'm happy with it and rebase it on the now-current tree rel1+patch1+...+patch97, I have two conflicts, and which I settle even before proposing anything. I might still get unlucky and patch99 which conflicts is applied after my rebase and before my patch gets reviewed... Notice that in (1), rel1 might be what is called a "devel release" ; while in (2), that will just be a "stable release" : what is the point of having "devel releases" when your living tree is available for all to base their work on? The conflicts can't disappear, but they can get less painful. Snark on #sagemath -- To post to this group, send an email to sage-devel@googlegroups.com To unsubscribe from this group, send an email to sage-devel+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
