[cmake-developers] Rebase or not?

[Brad King]

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