[Starlingx-discuss] stx-nova repo changes for upstream tracking

[Kopec, Gerald (Gerry)]

I'm ok with new branches per rebase. 
We're not rebasing that often so I think it's manageable.

Gerry

-----Original Message-----
From: Dean Troyer [mailto:dtroyer at gmail.com] 
Sent: Monday, April 08, 2019 9:12 AM
To: starlingx
Subject: Re: [Starlingx-discuss] stx-nova repo changes for upstream tracking

On Fri, Apr 5, 2019 at 3:35 PM Chris Friesen
<chris.friesen at windriver.com> wrote:
> I like the idea of rebasing periodically to keep our changes "on top".
>
> Rather than force-pushing, it might make sense to create a new branch
> for each of these rebases.  That way we don't need to rewrite history.

We could do that, it would mean updating manifest files or whatever
else points to the right branch each time and be one more thing to
track for debugging.  I had considered renaming the prior stx/stein
branch and creating a new one, the effect is the same as a force push
but it preserves that bit of history.

I don't have much invested in either option, but I lean toward always
building from stx/stein.  Opinions from those who this would affect
more directly?

dt

-- 
Dean Troyer
dtroyer at gmail.com

_______________________________________________
Starlingx-discuss mailing list
Starlingx-discuss at lists.starlingx.io
http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss