Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explain branching strategy #36092

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Explain branching strategy #36092

merged 1 commit into from
Jun 7, 2024
+6 −0

Conversation

fulldecent
Copy link
Contributor

Questions Answers
Branch? develop
Description? Update documentation about how we do branching here
Type? improvement
Category? PM
BC breaks? no
Deprecations? no
How to test? read markdown
Fixed issue or discussion? discussed at #36090 (comment)

@fulldecent fulldecent requested a review from a team as a code owner May 3, 2024 20:41
@prestonBot
Copy link
Collaborator

Hello @fulldecent!

This is your first pull request on the PrestaShop project. Thank you, and welcome to this Open Source community!

@prestonBot prestonBot added develop Branch Improvement Type: Improvement labels May 3, 2024
@Hlavtox
Copy link
Contributor

Hlavtox commented May 3, 2024

I like the idea, but we should add information, that not all bug fixes go to the patch channel.

The general concensus is, that we allow simple, easy to test patches OR the ones where the fix is really major. If the fix works, but we smell potential dangers, we leave it to develop branch.

@fulldecent
Copy link
Contributor Author

I'm happy to make changes on this PR. What you're describing may also need to be updated in that blog post.

Also, maybe we just merge this as is and wait until the pull requests come in and deal with them on a case by case basis

@nicosomb nicosomb requested a review from kpodemski May 4, 2024 05:58
jolelievre
jolelievre approved these changes May 7, 2024
View reviewed changes
Copy link
Contributor

@jolelievre jolelievre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @fulldecent

matks
matks approved these changes Jun 7, 2024
View reviewed changes
Copy link
Contributor

@matks matks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could improve this further, but I don't want to nitpick 😉 it's quite good as it is. Other improvements can be done by other Pull Requests

@ps-jarvis ps-jarvis added the Waiting for QA Status: action required, waiting for test feedback label Jun 7, 2024
@matks
Copy link
Contributor

matks commented Jun 7, 2024

Thank you @fulldecent

@matks matks merged commit d8759fe into PrestaShop:develop Jun 7, 2024
35 checks passed
@matks matks added this to the 9.0.0 milestone Jun 7, 2024
@matks matks removed the Waiting for QA Status: action required, waiting for test feedback label Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matks matks matks approved these changes

@jolelievre jolelievre jolelievre approved these changes

@kpodemski kpodemski Awaiting requested review from kpodemski

Assignees
No one assigned
Labels
develop Branch Improvement Type: Improvement
Projects
PR Dashboard
Status: Merged
Milestone
9.0.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@fulldecent @prestonBot @Hlavtox @matks @jolelievre @ps-jarvis