WindmillWWindmill
Powered by
vinceV
Windmill•2y ago
vince

GitHub PR's between workspaces showing merge conflicts

Hi Team,

We are running into an issue on windmill regarding GitHub PR's. We have windmill setup in a way where deploying in the staging workspace will create a PR on github to update apps on the prod workspace.
The issue is that anytime we deploy on staging, the PR generated will mark any changes made on the yaml file as a merge conflict (even though those changes are the updates we are making). Do you have any insight on what could be causing this?
WindmillJoin
3,362Members
Resources
Recent Announcements

Similar Threads

Was this page helpful?
Recent Announcements
henri-c

Weekly kenote to tell you about our latest updates https://discord.com/channels/930051556043276338/1278977038430240813 https://youtube.com/live/2dGd9TdT8xs?feature=share

henri-c · 4d ago

Pyra

### HTTP tracing (EE) Capture HTTP requests made by job scripts as observability spans Features: - View HTTP request traces (method, URL, status, timing) in the job details UI - Auto-instrumentation for Native TypeScript, MITM proxy for other languages - Integrates with external OpenTelemetry collectors changelog: https://www.windmill.dev/changelog/http-tracing docs: https://www.windmill.dev/docs/advanced/instance_settings#http-tracing Additionally jobs memory metrics are now fully OSS!

Pyra · 2w ago

henri-c

First keynote of the year here https://discord.com/channels/930051556043276338/1278977038430240813 🙂

henri-c · 4w ago

Similar Threads

Sharing quota between workspaces
JulioJJulio / help
3y ago
Github sync in one repo and two workspaces
Pankaj ThakurPPankaj Thakur / help
11mo ago
Connect to Slack on multiple workspaces
TimTTim / help
2y ago
GitHub OAuth
exographicskipEexographicskip / help
17mo ago