Hi, Some time ago we started Bareon project [1], and now we have some fixes landed to fuel-agent only, the question is what are the best practises on keeping two repos in sync with possibility to resolve conflicts manually? Cherry-picking patches manually doesn't look like the most error prone solution, are there any scripts written to make sure that repos are in one way sync (fuel-agent -> Bareon)? Thanks, [1] http://lists.openstack.org/pipermail/openstack-dev/2015-December/082397.html -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.openstack.org/pipermail/openstack-dev/attachments/20160208/ed33c942/attachment.html>