Exclude cspell.json from auto-sync (#7788)
This commit is contained in:
Родитель
227deafac0
Коммит
46729b221c
|
@ -36,22 +36,22 @@ jobs:
|
|||
TargetBranches:
|
||||
RPSaaSMaster:
|
||||
Theirs: '@("**")'
|
||||
Ours: '@("specification", "custom-words.txt")'
|
||||
Ours: '@("specification", "custom-words.txt", "cSpell.json")'
|
||||
Merge: '@("specification/common-types")'
|
||||
AcceptTheirsForFinalMerge: true
|
||||
RPSaaSDev:
|
||||
Theirs: '@("**")'
|
||||
Ours: '@("specification", "custom-words.txt")'
|
||||
Ours: '@("specification", "custom-words.txt", "cSpell.json")'
|
||||
Merge: '@("specification/common-types")'
|
||||
AcceptTheirsForFinalMerge: true
|
||||
ARMCoreRPDev:
|
||||
Theirs: '@("**")'
|
||||
Ours: '@("specification", "custom-words.txt")'
|
||||
Ours: '@("specification", "custom-words.txt", "cSpell.json")'
|
||||
Merge: '@("specification/common-types")'
|
||||
AcceptTheirsForFinalMerge: true
|
||||
InternalARMContracts:
|
||||
Theirs: '@("**")'
|
||||
Ours: '@("specification", "custom-words.txt")'
|
||||
Ours: '@("specification", "custom-words.txt", "cSpell.json")'
|
||||
Merge: '@("specification/common-types")'
|
||||
AcceptTheirsForFinalMerge: true
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче