twelve-of-code-official / website

The source code for the Twelve of Code website
https://mesure.x10.mx/twelve-of-code
GNU General Public License v3.0
0 stars 0 forks source link

Merge main into develop #151

Closed github-actions[bot] closed 6 months ago

github-actions[bot] commented 6 months ago

Automatically merging main into develop on push to main. Pull request created automatically by GitHub Actions.

netlify[bot] commented 6 months ago

Deploy Preview for m73l-twelve-of-code-dev canceled.

Name Link
Latest commit e7eb0742987e614e3052f6e062ab648608bd99e7
Latest deploy log https://app.netlify.com/sites/m73l-twelve-of-code-dev/deploys/65d95ec05193100008c8b36b
Mesure73L commented 6 months ago

In the future, if the PR was created by someone else, please do not merge it if you approved the changes

BeepBot99 commented 6 months ago

Okay, but you cannot approve it. Also, please do not merge pull requests you review then.

Mesure73L commented 6 months ago

Okay, but you cannot approve it.

Yes, but I can merge it once you approve it.

Also, please do not merge pull requests you review then.

I said if the PR was created by someone else, the reason is I want both of us to be okay with it before it is merged.

Mesure73L commented 6 months ago

So if one person requests a review and doesnt unrequest it, they are fine with it being merged

Mesure73L commented 6 months ago

but btw I've already been letting you merge it for ones I've approved most of the time

BeepBot99 commented 6 months ago

Yes, but for these automated ones, you must be fine with it, because the pull request that triggered it, you were fine with it.

Mesure73L commented 6 months ago

They are different PRs

BeepBot99 commented 6 months ago

Yes, but all the content in the automated PRs must have already been approved by both of us.

Mesure73L commented 6 months ago

But still, if it was not created by you or me specifically, one of us accepts it and the other merges it, unless both of us gave an approving review

BeepBot99 commented 6 months ago

Okay, fine, but I'm just saying there is never going to be any case in which we both haven't already approved it.