I think a more robust solution would be to create a replica of the fuel-agent master branch in the bareon repo (that can be automatically synced with a fast-forward merge). This would allow you to push merge commits (that can include manual merge resolution) from fuel-agent/master into bareon master branch.
-- Dmitry Borodaenko On Mon, Feb 08, 2016 at 04:13:55PM +0300, Evgeniy L wrote: > 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 > __________________________________________________________________________ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: [email protected]?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev __________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: [email protected]?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
