Conversation
ViniTou
left a comment
There was a problem hiding this comment.
but please avoid branch names like 1.0 for doing merges.
|
@ViniTou What's preferred? "Merge remote-tracking branch 'origin/1.0' into 4.6"? |
|
@glye Edit: But i still have my doubts, as I believe there is a chance that 1.0 branch will be deleted after this merge. |
mnocon
left a comment
There was a problem hiding this comment.
I think something is wrong here.
Ibexa DXP 3.3 uses post-install 1.0:
https://github.com/ibexa/oss/blob/3.3/composer.json#L30
And the 1.0 branch should keep being a branch dedicated for 3.3
Right now it contains merged changes from 4.6:
https://github.com/ibexa/post-install/tree/1.0
So when we tag the package for 3.3 (from 1.0 branch) I think it will be incorrect!
For example, this should say https://github.com/ibexa/post-install/blob/1.0/composer.json#L63 1.0.x-dev, the PHP version is bumped to 7.4 as well
|
Not sure what happened here. This PR looks OK to me, but the 1.0 branch looks borked indeed. |
|
@glye |
|
@glye yes, 1.0 is essentially broken now. Moreover if you create PR merging 4.6 from 1.0, there's a chance that 1.0 gets automatically deleted after merging this PR. If you need to make a merge up PR, never use stable branch as a source, create tmp version of it. |
|
That's what I get from being stressed and following github instructions to the letter. Discussing fixes with Dawid & Marek |
|
New, separate PR for 4.6: #86 |
Merge up of https://github.com/ibexa/post-install-ghsa-4h8f-c635-25p7/pull/1