Re: Proposal - unprotect develop branch of geode-native

2021-08-17 Thread Jacob Barrett
It is actually worse than described right now. Even the combining of the PRs wouldn’t pass because they can’t affect the images themselves, which need patching to pass. The images are tainted by a previous merge too. So pinning back to an older image allows one of the fixes to pass but the other

RE: Proposal - unprotect develop branch of geode-native

2021-08-17 Thread Blake Bender
g Subject: Re: Proposal - unprotect develop branch of geode-native For this situation in Geode repo, in addition to Squash, we also allow Rebase. This would allow you to put both commits in the same PR to pass checks, but still apply them to develop as separate commits. On 8/17/21, 2:20 PM, &quo

Re: Proposal - unprotect develop branch of geode-native

2021-08-17 Thread Owen Nichols
For this situation in Geode repo, in addition to Squash, we also allow Rebase. This would allow you to put both commits in the same PR to pass checks, but still apply them to develop as separate commits. On 8/17/21, 2:20 PM, "Blake Bender" wrote: Hello everyone, Today I once again f