On 16/12/2012 12:40, Jonas Smedegaard wrote: > I like that our current structures work well for unstable, testing, > stable and oldstable - i.e. that it is only tricky to handle > experimental which we make no promises for anyway. > > I suspect the better approach than force-merging with "--strategy ours" > would be to rebase experimental on top of master. > > If you insist on trating experimental as mainline, could you perhaps > check if anyone else in Debian does similar and has documented their > practice and experiences with it?
Damn me, i did not understand that rebase was what i was missing. Thank you for your answers, i won't insist. Jérémy.
Description: OpenPGP digital signature