File tree Expand file tree Collapse file tree 3 files changed +43
-0
lines changed Expand file tree Collapse file tree 3 files changed +43
-0
lines changed Original file line number Diff line number Diff line change
1
+ {
2
+ "merge-flow-configurations" : {
3
+ "main" : {
4
+ "MergeToBranch" : " feature/lsp" ,
5
+ "ExtraSwitches" : " -QuietComments"
6
+ }
7
+ }
8
+ }
Original file line number Diff line number Diff line change
1
+ {
2
+ "merge-flow-configurations" : {
3
+ // regular branch flow
4
+ "release/dev17.13" : {
5
+ "MergeToBranch" : " main" ,
6
+ "ExtraSwitches" : " -QuietComments"
7
+ },
8
+ "main" : {
9
+ "MergeToBranch" : " release/dev17.14" ,
10
+ "ExtraSwitches" : " -QuietComments"
11
+ }
12
+ }
13
+ }
Original file line number Diff line number Diff line change
1
+ # Merges any changes from servicing branches forward.
2
+
3
+ name : Flow servicing changes to main
4
+ on :
5
+ push :
6
+ branches :
7
+ - ' release/*'
8
+ - ' main'
9
+
10
+ permissions :
11
+ contents : write
12
+ pull-requests : write
13
+
14
+ jobs :
15
+ servicing-flow :
16
+ uses : dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
17
+ with :
18
+ configuration_file_path : ' .config/service-branch-merge.json'
19
+ feature-lsp-flow :
20
+ uses : dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
21
+ with :
22
+ configuration_file_path : ' .config/feature-lsp-branch-merge.json'
You can’t perform that action at this time.
0 commit comments