On 09/08/2010 11:35 AM, Andreas Schneider wrote: > On Tuesday 31 August 2010 03:07:16 Miguel A. Figueroa-Villanueva wrote: >> ...o----o master >> . \ >> . o----o----o topic >> . \ \ >> ...o----o----o----o *next, origin/next >> >> Is this what should be done in such cases? Is there a way to signal >> the first merge to next as one that should not be merged to master? > > Normally > > git rebase origin/next > > is your friend to come back and get a nice o---o---o---o---o
Yes, but: (1) Once the topic has been published it should not be rewritten (2) No work should be based or rebased on next -Brad _______________________________________________ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
