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.

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

[FEATURE] Update feature branch guidance for how to update branches #139

Open
joshuarrrr opened this issue Mar 7, 2023 · 3 comments
Open
Labels
enhancement New feature or request

Comments

@joshuarrrr
Copy link
Member

Is your feature request related to a problem?

We've seen some confusion when it comes to how to keep feature branches updated and sync'd with main. We can provide some additional guidance in https://github.com/opensearch-project/.github/blob/main/CONTRIBUTING.md#feature-branches to reduce that.

What solution would you like?

The feature team is responsible for opening a PR when they would like the feature branch to be updated. The simple and easiest way is to just raise a PR from main to the feature branch.

What alternatives have you considered?

Do you have any additional context?

An example of a PR with confusion: opensearch-project/OpenSearch-Dashboards#3273

@joshuarrrr joshuarrrr added enhancement New feature or request untriaged labels Mar 7, 2023
@dblock
Copy link
Member

dblock commented Mar 7, 2023

Can we introduce automation for this? Maybe a bot that merges main to feature branches on demand that's not a PR?

@joshuarrrr
Copy link
Member Author

We could, but that removes some control from a feature team, and requires more frequent pulls. But it may be a tradeoff worth making.

@dblock
Copy link
Member

dblock commented Mar 8, 2023

Maybe automation could be making these PRs all the time? The problem is always that conflicts need resolving, and at some point a human has to do it.

@dblock dblock removed the untriaged label Mar 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants