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

[Greg Chicares]

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

If it's all the same to you, I'd prefer number two: rebase on master.
Number one would add a dimension to the topology, and that's still an
obstacle for me (I've been doing that to the "valyuta" branches, but
their commits will never be merged into master--instead, I hope to
reconstruct the sensible parts and discard the fits and starts).
I wouldn't object to number three, but it's probably worse from your
POV to lose the history.