# feat\(settings\): add pullRequestMergeMethod as a project-scopable server setting · pingdotgg/t3code

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/e84d87a4a3f763e4e71fc3f31bf751a6d9cf7e39)

Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code)

Visibility: public

Requested revision: e84d87a4a3f763e4e71fc3f31bf751a6d9cf7e39

Requested commit: e84d87a4a3f763e4e71fc3f31bf751a6d9cf7e39

Commit: e84d87a4a3f763e4e71fc3f31bf751a6d9cf7e39

Tree: 2862bb755d3167c740edea46f55613f064e7b316

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
feat(settings): add pullRequestMergeMethod as a project-scopable server setting

The default merge method lived only as a per-project map in client
settings, so it could not be set for an environment and overridden per
project like everything else. It becomes a nullable server key (null keeps
using the method last chosen on this device) in the project-scoped set.
Also unbreaks the fold test's typecheck: encode JSON through Schema and type
the assertions.

```

## Parents

- [c60b071c65d1b3359795f951e8a96facfb475546](https://git.cafe/pingdotgg/t3code/commit/c60b071c65d1b3359795f951e8a96facfb475546?format=markdown)

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/e84d87a4a3f763e4e71fc3f31bf751a6d9cf7e39?format=markdown)