Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [theia-dev] New feature enabled for CI: Require branches to be up to date before merging

Hi Vince,

------ Original Message ------
From "Vincent Fugnitto via theia-dev" <theia-dev@xxxxxxxxxxx>
There does not seem to be the automatic "update" button during CI from forks unless explicity set by each contributor
Not sure what you mean by that. I see the update button on PR's where I have write access to the branch being merged. Is that different for non-committers? 


Asking contributors to constantly rebase since master was updated adds friction, and it becomes increasingly difficult to get something merged from different time zones (ex: China) as master is a moving target
I don't think that's what we're asking for: we're asking for the PR to be up-to-date before merging. That means once, and if you allow "updates by maintainers", the person merging even can do the honors themselves. We have approximately 1 PR being merged per day. The chance of conflict seems very small to me. 

I think we may want to revisit the option, especially since we haven't really encountered an issue with an outdated pull-request often, and the drawbacks I've mentioned.
I can add a note in the dev meeting if needed.

As I understood the conversation in the community meeting last tuesday, we're going to trial the new system for a month and then reevaluate anyway on the merits. As far as I'm concerned, I'm not just saying that.

/Thomas

Back to the top