From fe7e7b5ffb148e028c6a2367988bfda9c15593a9 Mon Sep 17 00:00:00 2001 From: Mickael Istria Date: Mon, 12 Feb 2024 10:59:19 +0100 Subject: [PATCH] Disable merge commits for jdt-incubator (#3) * Disable merge commits for jdt-incubator Merge commit would make further attempt to merge it in upstream JDT harder. Let's disable those. Signed-off-by: Mickael Istria * Fix disable merge commits + enable PR updates PR updates make rebase/review easier without necessarily involving the submitter for a rebase. Signed-off-by: Mickael Istria --------- Signed-off-by: Mickael Istria --- otterdog/eclipse-jdtls.jsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/otterdog/eclipse-jdtls.jsonnet b/otterdog/eclipse-jdtls.jsonnet index 8f236bc..543ac72 100644 --- a/otterdog/eclipse-jdtls.jsonnet +++ b/otterdog/eclipse-jdtls.jsonnet @@ -34,8 +34,8 @@ orgs.newOrg('eclipse-jdtls') { ], _repositories+:: [ orgs.newRepo('eclipse-jdt-core-incubator') { - allow_merge_commit: true, - allow_update_branch: false, + allow_merge_commit: false, + allow_update_branch: true, default_branch: "master", delete_branch_on_merge: false, dependabot_alerts_enabled: false,