# Merge remote-tracking branch 'upstream/main' into babysit-22029 · pingdotgg/t3code

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

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

Visibility: public

Requested revision: cab866468ea55076d613c1a1b4f95c746aacad18

Requested commit: cab866468ea55076d613c1a1b4f95c746aacad18

Commit: cab866468ea55076d613c1a1b4f95c746aacad18

Tree: ef25865cce9d058b84034905e32f51c0c5dfb062

Author: Victor Vogel

Committer: Victor Vogel

## Message

```
Merge remote-tracking branch 'upstream/main' into babysit-22029

# Conflicts:
#	apps/server/src/pullRequest/PullRequestService.ts
#	packages/source-control-bitbucket/src/server/BitbucketApi.test.ts
#	packages/source-control-bitbucket/src/server/BitbucketApi.ts
#	packages/source-control-bitbucket/src/server/BitbucketPullRequestProvider.ts
#	packages/source-control-core/src/server/PullRequestProvider.ts

```

## Parents

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

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

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