Skip to content

Commit b783820

Browse files
authored
update auto merge config (#79949)
1 parent b7353b8 commit b783820

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/main-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ jobs:
2121
if: github.repository == 'dotnet/roslyn'
2222
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
2323
with:
24-
configuration_file_path: 'eng/config/main-to-main-vs-deps-branch-merge.jsonc'
24+
configuration_file_path: 'eng/config/community-to-main-branch-merge.jsonc'
2525
configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}
2626

eng/config/main-to-main-vs-deps-branch-merge.jsonc renamed to eng/config/community-to-main-branch-merge.jsonc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Used by .github/workflows/main-merge.yml
22
{
33
"merge-flow-configurations": {
4-
// Merge any main changes to main-vs-deps.
5-
"main": {
6-
"MergeToBranch": "main-vs-deps",
4+
// Merge any community changes to main.
5+
"community": {
6+
"MergeToBranch": "main",
77
"ExtraSwitches": "-QuietComments"
88
}
99
}

0 commit comments

Comments
 (0)