fix: used merge-upstream to sync fork & upstream

[asheerrizvi]

Summary

Fixes #6116

Checklist

Please add a x inside each checkbox:

• I have read the contribution guidelines.
• Code is formatted via running yarn format.
• Tests are passing via running yarn test.
• The status checks are successful (continuous integration). Those can be seen below.

🐢

[stale]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

[martinjagodic]

@asheerrizvi can you solve the merge conflict, please?

[netlify]

✅ Deploy Preview for cms-demo canceled.

Name	Link
🔨 Latest commit	004ec53
🔍 Latest deploy log	https://app.netlify.com/sites/cms-demo/deploys/6554c3f7219c7a00083b40da

[martinjagodic]

I tried to set this up on a project with the open authoring setup, but somehow the merge-upstream endpoint returns 422 Unprocessable Content every time.

Tests are failing because the merge-upstream endpoint has to be mocked in Github Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry on fork.json

[netlify]

✅ Deploy Preview for decap-www ready!

Name	Link
🔨 Latest commit	004ec53
🔍 Latest deploy log	https://app.netlify.com/sites/decap-www/deploys/6554c3f75f496c0009b7c571
😎 Deploy Preview	https://deploy-preview-6504--decap-www.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.