dotnet / dotnet/arcade

Inter-branch merge workflow failing in sourcelink and ResetToTargetPath still causes conflicts

Open
#16,516 1 comment 0 reactions 0 assignees View on GitHub
Dominant language
C#
Stars
729
Forks
397
Avg merge
3d 15m
Merged PRs (30d)
149

Description

See https://github.com/dotnet/sourcelink/actions

Also, the ResetToTargetPath functionality seems to not work as intended as it still shows conflicts in files listed here: https://github.com/dotnet/sourcelink/blob/c23996c885a40466b8e6153efbe4662421cdaef5/github-merge-flow.jsonc#L30-L34

cc @mmitche

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.