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 <[email protected]> * 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 <[email protected]> --------- Signed-off-by: Mickael Istria <[email protected]>
eclipse-jdtls · Feb 12, 2024 · fe7e7b5 · fe7e7b5
1 parent 426af2f
commit fe7e7b5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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,