Should I rebase[2] all my branches on master directly and then follow
> the OpenNebula releases or is there a path to merge master and one-4.10?
> Hmm, writing the question seems to gives my answer, it looks like the
> cherry-picking of master commits on the one-<version> branches are the
> reasons of the merge conflicts.

Yes... that's the way we usually do it: by cherry picking the commits.
Unfortunately we don't think there's an easier way.

Jaime Melis
Project Engineer
OpenNebula - Flexible Enterprise Cloud Made Simple
www.OpenNebula.org | jme...@opennebula.org
Users mailing list

Reply via email to