You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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:
Please vote this issue up (👍) to prioritize it.
Leave comments to help us solidify the vision.
The text was updated successfully, but these errors were encountered:
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:
The text was updated successfully, but these errors were encountered: