Marian, You can check more about Gitbox here [1].
My understanding is that all ASF code repositories are required to be hosted in Apache infra. In the case of gIt repositories, the real source of truth is GitBox (not GitHub). However the Apache Infra provides a seamless mirroring capabilities between both GitBox and GitHub. We, as community members, are the ones responsible to define our own rules (like always submit PRs and no direct pushed), but there's nothing that blocks any committer do direct commits directly to GiBox and skipping any configuration in GitHub. In your case you have access to GitBox here [2]. (PS: if you open this link in the browser, seems that it redirects to GitHub, but if you clone via CLI, you'll be asked gitbox/Apache credentials) Hope this helps. [1] - https://gitbox.apache.org/boxer/ [2] - https://gitbox.apache.org/repos/asf/incubator-kie-kogito-serverless-operator.git On Wed, Oct 4, 2023 at 12:18 PM Marian Macik <[email protected]> wrote: > > Alex, > > what do you mean by that? To merge locally and push it directly to the > GitHub without a PR? As I said, it is really a one-off, so if this is > OK, we may do it like this. > > Marian > > > On Wednesday, 4 October 2023 at 10:55 -0400, Alex Porcelli wrote: > > If this is one off, there's direct access to gitbox. > > > > On Wed, Oct 4, 2023 at 10:43 AM Jason Porter > > <[email protected]> wrote: > > > > > > @Alex, > > > > > > We can control this with the .asf.yaml file, correct? > > > > > > -- > > > Jason Porter > > > Software Engineer > > > He/Him/His > > > > > > IBM > > > > > > > > > From: Marian Macik <[email protected]> > > > Date: Wednesday, October 4, 2023 at 07:54 > > > To: [email protected] <[email protected]> > > > Subject: [EXTERNAL] 'Create a merge commit' button disabled > > > Hi all! > > > > > > Me and Ricardo have a PR [1] in the incubator-kie-kogito- > > > serverless- > > > operator repository, which is also bringing some code from the > > > kogito- > > > operator BDD testing framework as a separate Go module. We decided > > > to > > > extract it so we don't depend on the kogito-operator repository and > > > also create a separate Go module from it, so it is nicely > > > organized. In > > > addition, we would like to retain a commit history/contributions of > > > this source code as a lot of people have been working on it over > > > the > > > years. So I did some Git trickery to retain the relevant history > > > and in > > > the end did the merge commit which merged this history to the > > > incubator-kie-kogito-serverless-operator. > > > > > > The issue now is that we would like to merge this PR using the > > > 'Create > > > a merge commit' button, which is unfortunately disabled for that > > > repository. 'Squash and merge' is not an option as this would add > > > contributions correctly on GitHub on one hand, on the other we > > > would > > > lose the git blame history line by line in the source code. The > > > last > > > option, 'Rebase and merge' will do a rebase without the merge > > > commits > > > and will disorganize history completely. I have already tried it in > > > my > > > fork, so that is a no-go either. > > > > > > Is there a possibility to enable the `Create a merge commit` button > > > for > > > this repository? Who can we contact to ask and change that? I know > > > merge commits are not ideal but in this case it makes sense. Thanks > > > a > > > lot for guidance. > > > > > > Best regards, > > > > > > Marian Macik > > > > > > [1] > > > https://github.com/apache/incubator-kie-kogito-serverless-operator/pull/266 > > > > > > > > > ------------------------------------------------------------------- > > > -- > > > To unsubscribe, e-mail: [email protected] > > > For additional commands, e-mail: [email protected] > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > For additional commands, e-mail: [email protected] > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
