On 1/2/2012 7:25 PM, Eric Noulard wrote:
Just pushed it forward on stage:
see:
http://public.kitware.com/Bug/view.php?id=10067
It looks like it cannot be merged [automatically] to next anymore.
It is possible that the conflicting change is already in master.
That is a justification to merge master into your topic to resolve
the conflict, or rebase your topic on master to resolve it.
-Brad
--
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
