On 10.03.2012 21:10, David Cole wrote:
If somebody else has done work since the last time you pushed it to
'stage', then you should rebase any of your work on top of that to
keep a linear topic branch history.
git checkout ninja-generator # (your local one...)
git pull --rebase stage ninja-generator
should do what you're asking.
The other alternative is to always grab the latest from the stage
before you begin your work. (But you may still need to rebase if
somebody else is also working on it at the same time, and that
developer pushes first...)
Do you want me to clean up the commits you just pushed and make it
linear with no merges, or would you like to do it yourself?
Thanks (and hope this helps),
David
Thanks David, then I pull rebased in future.
And how could I rebase the already pushed branch?
Peter
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
