chore: update tokens workflow

[alizedebray]

Updated the tokens PR workflow to:

• have only one merging branch to prevent overriding changes from the current month with changes from the past month,
• stop merging the main branch into the token branch, merge it into the merging branch instead

[changeset-bot]

⚠️ No Changeset found

Latest commit: 3e6bc1e

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[sonarcloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[alizedebray]

@oliverschuerch
I implemented the solution you suggested: 1deaf1b
The only thing is that it closes the current PR and opens an new one anytime changes are pushed to the tokens branch, which will happen multiple times a day, thereofre the PR numbers add up.

I also created this version that only updates the existing PR: 82b57a3
It merges the token branch into the PR branch using -X theirs to accept their changes in case of conflicts, then merges the main branch into the PR branch using -X ours.

With both solutions, the tokens branch remain untouched.

Can you please have a look at both solutions and give me your feedback on which one we should use?