diff --git a/.backportrc.json b/.backportrc.json index 6349917d..2178d6ec 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -3,6 +3,11 @@ "repoName": "ems-file-service", "targetBranches": ["feature-layers"], "targetPRLabels": ["backport"], + "branchLabelMapping": { + "feature-layers": "feature-layers" + }, + "autoMerge": false, + "autoMergeMethod": "squash", "commitConflicts": true, "fork": false } diff --git a/renovate.json b/renovate.json index 75742d20..b6d2ab97 100644 --- a/renovate.json +++ b/renovate.json @@ -4,5 +4,9 @@ "minimumReleaseAge": "14 days", "extends": [ "github>elastic/renovate-config" + ], + "baseBranches": ["master", "feature-layers"], + "labels": [ + "dependencies" ] }