dotnet / dotnet/roslyn-tools

Update Existing PR workflow often runs into merge conflicts

Open
#434 0 comments 0 reactions 0 assignees View on GitHub
Dominant language
C#
Stars
109
Forks
85
Avg merge
2d 16h
Merged PRs (30d)
1

Description

Since the update workflow edits the commonly updated default.config/*component.json files it almost always ends up in a conflict. We'd need to determine a way of auto-resolving conflicts, probably always prefer changes from the PR. This is needed to truly make this an automated process. Any thoughts on this are welcome.

Contributor guide

No contributing guide indexed for this repository

Research direction

Start with the Update Existing PR workflow and inspect how it edits the default.config/*component.json files and handles merge conflicts. Determine whether conflicts can be resolved automatically by preferring changes from the PR; done means the workflow completes without manual conflict resolution for these updates.

Written by the indexing model from the issue text.

Assessment

Tech stack
csharp
Domain
ci-cd, devtools
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.