We have a Github repo set up with both "Merge" and "Squash" methods enabled at the repo level (rebase disabled), and rulesets for our long-lived branches that further restrict the methods: the "qa" branch only allows Squash, and the main branch only allows Merge. However, when merging via the Graphite UI to the "qa" branch, both Merge and Squash are available as options and both work. We just had someone merge a 14 PR stack to qa using the Merge method, resulting in 110 commits to the branch vs the 14 expected. Why was this allowed and not restricted to Squash only?

hey James, the merge method list comes from the repo-level GitHub settings, not from the per-branch rulesets on 

qa

 / 

main

. If 

qa

 can also use GitHub’s “Require linear history” rule, that is the setting Graphite currently uses to hide merge commits for that target. I'm logging this in our backlog so the merge method picker can follow the branch ruleset, not only the repo defaults.

ok thanks for the response. Any idea of ETA? Weeks? Months?

No formal ETA for this one unfortunately