Skip to content

Commit

Permalink
Allow merge commits on all C++ repos (#59)
Browse files Browse the repository at this point in the history
We are encouraging developers to submit PRs with clean, well structured
commit histories. In order to preserve these commit histories *and*
retain traceability to the original review, we are using merge commits.
  • Loading branch information
gregmedd authored Jun 19, 2024
1 parent fa49c94 commit 03defca
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions otterdog/eclipse-uprotocol.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ orgs.newOrg('eclipse-uprotocol') {
web_commit_signoff_required: false,
},
orgs.newRepo('up-transport-vsomeip-cpp') {
allow_merge_commit: true,
allow_update_branch: false,
code_scanning_default_languages: [
"c-cpp"
Expand Down Expand Up @@ -434,6 +435,7 @@ orgs.newOrg('eclipse-uprotocol') {
web_commit_signoff_required: false,
},
orgs.newRepo('up-transport-zenoh-cpp') {
allow_merge_commit: true,
allow_update_branch: false,
code_scanning_default_languages: [
"c-cpp"
Expand Down Expand Up @@ -494,6 +496,7 @@ orgs.newOrg('eclipse-uprotocol') {
web_commit_signoff_required: false,
},
orgs.newRepo('up-zenoh-example-cpp') {
allow_merge_commit: true,
allow_update_branch: false,
code_scanning_default_languages: [
"c-cpp"
Expand Down

0 comments on commit 03defca

Please sign in to comment.