Quoting Jérémy Lal (2012-12-16 12:52:17)
> 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.

I am not certain it will work, mind you.

Also, the rebase may need to be done on a temporary throw-away branch 
then merged onto master branch as a separate step: Rebase involves 
rewriting history which shouldn't be leaked onto our public git.

(hope that made sense - I am not really good at this...)

 - Jonas

 * Jonas Smedegaard - idealist & Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private

Attachment: signature.asc
Description: signature

Pkg-javascript-devel mailing list

Reply via email to