microsoft / microsoft/finops-toolkit

GitHub action to sync branches

Open
#201 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Help wanted ✨ Skill: DevOps
Dominant language
PowerShell
Stars
603
Forks
248
Avg merge
7d 11h
Merged PRs (30d)
11

Description

⚠️ 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.

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Start with the existing Merge-DevBranch * script and the repository's GitHub Actions configuration. Trace how dev is merged into feature branches, then define the workflow's conflict behavior: create an issue for an out-of-sync branch or comment on an existing one. Done means the action runs on updates and handles successful and conflicting merges as described.

Written by the indexing model from the issue text.

Assessment

Tech stack
github-actions, powershell
Domain
ci-cd, devops
Issue type
Feature
Difficulty
4/5
Estimated time
3-5 days
Activity status
Stale
Clarity
Mostly clear
Newbie friendliness
35/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.