Enabled tests

[amartya4256]

What it does

Enabled some disabled tests which aren't in broken state anymore.
eclipse-platform/eclipse.platform#525

How to test

Author checklist

• [x ] I have thoroughly tested my changes
• [ x] The change is following the coding conventions
• [ x] I have signed the Eclipse Contributor Agreement (ECA)

[jukzi]

@iloveeclipse i accidentally pressed update branch button which created a merge commit. can you disable that button? see https://github.com/orgs/community/discussions/3245#discussioncomment-7339067

[iloveeclipse]

@iloveeclipse i accidentally pressed update branch button which created a merge commit. can you disable that button? see https://github.com/orgs/community/discussions/3245#discussioncomment-7339067

I do not see options shown on referenced screen.

All "merges" are disabled for this repo, yet "Update with merge" is still shown for PR's here. I believe that is exactly what the last comment on the thread youare referring to is saying.

[akurtakov]

@jukzi @iloveeclipse As self service is enabled you should be able to provida a PR for https://github.com/eclipse-jdt/.eclipsefdn/blob/main/otterdog/eclipse-jdt.jsonnet setting the needed property as described at https://otterdog.readthedocs.io/en/latest/reference/organization/repository/branch-protection-rule/

[netomi]

I do believe this comes from the setting:

allow_update_branch: true

which will show a button in the PR if the PR branch can be updated with changes from the target branch prior to merging the PR.

The setting

allow_merge_commit: true

will affect the options that you get when you actually wanna merge the PR, but the merge commit happened before the merge to the target branch.

[jukzi]

will allow_update_branch=false still show "rebase" button?

[netomi]

No, it will not show any button anymore, so if you just wanna prevent merge commits from happening, the setting that you change will be good imho.

[jukzi]

@amartya4256 tests are green now. thanks for your contribution.