Re: [lmi] How to best merge CI configuration fixes?

[Vadim Zeitlin]

On Mon, 5 Oct 2020 23:44:32 +0000 Greg Chicares <gchicares@sbcglobal.net> wrote:

GC> On 2020-10-05 21:45, Vadim Zeitlin wrote:
GC> > 
GC> >  We've made some fixes and improvements to the CI configuration in
GC> > https://github.com/vadz/lmi/pull/155 and I'd like to merge this before
GC> > creating the other PRs, so that the CI build would run the tests
GC> > automatically for them. And normally I should be able to do it myself, as
GC> > you gave me permission to modify the files under .github/workflows on my
GC> > own, but here I have not one but 5 commits to make, so I wonder whether I
GC> > should:
GC> > 
GC> > 1. Make a merge (which would be normal for me, but I don't know if it's
GC> >    acceptable for you even when it doesn't touch any other files).
GC> > 2. Rebase on master, i.e. make 5 commits there.
GC> > 3. Squash-merge, i.e. make just a single commit with all the changes.
GC> 
GC> If it's all the same to you, I'd prefer number two: rebase on master.

 Thanks! Done now.

 There could be more changes to this file in the future, but probably as
one-off commits and not series of commits like this, so this question
shouldn't arise again.

 Thanks again for your quick answer,
VZ

pgpk3fQERWnm_.pgp
Description: PGP signature