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

GitHub action to sync branches #201

Open
flanakin opened this issue Jul 8, 2023 · 0 comments
Open

GitHub action to sync branches #201

flanakin opened this issue Jul 8, 2023 · 0 comments
Labels
Help wanted ✨ Extra attention is needed Skill: DevOps GitHub setup and automation

Comments

@flanakin
Copy link
Collaborator

flanakin commented Jul 8, 2023

⚠️ Problem

Merges are currently manually run, which can lead to branches going stale and complicating merges later.

🛠️ Solution

Create a GitHub action to merge dev to all feature branches when there are updates.
If there's a merge conflict, create an issue to track the out-of-sync feature branch.
If an out-of-sync issue already exists, add a comment instead of creating a new issue.

ℹ️ Additional context

This can leverage the Merge-DevBranch * script to execute merge but will need to add support for creating issues when a branch fails to merge. We can also split those out as separate tasks, if someone wants to knock out the simple merge script as an easy win.

🙋‍♀️ Ask for the community

We could use your help:

  1. Please vote this issue up (👍) to prioritize it.
  2. Leave comments to help us solidify the vision.
@flanakin flanakin added Help wanted ✨ Extra attention is needed Skill: DevOps GitHub setup and automation labels Jul 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Help wanted ✨ Extra attention is needed Skill: DevOps GitHub setup and automation
Projects
None yet
Development

No branches or pull requests

1 participant