You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@lucene.apache.org by GitBox <gi...@apache.org> on 2021/02/14 16:07:29 UTC
[GitHub] [lucene-site] janhoy opened a new pull request #40: Clarify merge strategy
janhoy opened a new pull request #40:
URL: https://github.com/apache/lucene-site/pull/40
To avoid production and master branches for the website coming out of sync, we clarify that all edits should be committed to master branch, and then merge master -> production branch.
Also allow merge commit from GitHub UI merge button, and not force squash commit, which will allow us to use the UI to do the merge from master->production.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-site] HoustonPutman commented on pull request #40: Clarify merge strategy
Posted by GitBox <gi...@apache.org>.
HoustonPutman commented on pull request #40:
URL: https://github.com/apache/lucene-site/pull/40#issuecomment-779473330
Ahh yeah I think you are right. Unfortunate
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-site] janhoy merged pull request #40: Clarify merge strategy
Posted by GitBox <gi...@apache.org>.
janhoy merged pull request #40:
URL: https://github.com/apache/lucene-site/pull/40
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-site] madrob commented on pull request #40: Clarify merge strategy
Posted by GitBox <gi...@apache.org>.
madrob commented on pull request #40:
URL: https://github.com/apache/lucene-site/pull/40#issuecomment-778799975
Should we protect the production branch too?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-site] janhoy commented on pull request #40: Clarify merge strategy
Posted by GitBox <gi...@apache.org>.
janhoy commented on pull request #40:
URL: https://github.com/apache/lucene-site/pull/40#issuecomment-779442259
> Small change, I think it would be nice to not allow the "squash merge" from a PR for the production branch.
Agree but don’t think that is possible to describe in asf.yaml without disabling squash on master too.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-site] janhoy commented on pull request #40: Clarify merge strategy
Posted by GitBox <gi...@apache.org>.
janhoy commented on pull request #40:
URL: https://github.com/apache/lucene-site/pull/40#issuecomment-778823430
> Should we protect the production branch too?
I think the protection we gain with .asf.yaml will only prevent force push. I'll add that to this PR. Does not look like we can protect the prod branch against random push, i.e. require a merge from main...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-site] HoustonPutman commented on pull request #40: Clarify merge strategy
Posted by GitBox <gi...@apache.org>.
HoustonPutman commented on pull request #40:
URL: https://github.com/apache/lucene-site/pull/40#issuecomment-779300243
Small change, I think it would be nice to not allow the "squash merge" from a PR for the production branch.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org