owidbot
commented
3 days ago | Quick links (staging server): Site | Admin | Wizard |
|---|
Login: ssh owid@staging-site-tmp-table-conflicts-staging
- Site-screenshots: https://github.com/owid/site-screenshots/compare/tmp-table-conflicts-staging
- SVG tester: https://github.com/owid/owid-grapher-svgs/compare/tmp-table-conflicts-staging
SVG tester:
Number of differences (default views): 0 ✅ Number of differences (all views): 0 ✅Edited: 2024-06-25 17:26:09 UTC Execution time: 1.11 seconds
In our new workflow, we need some way to track chart conflicts* between PROD and staging servers.
Currently, we define a conflict if the
updatedAtfield of a chart is greater in PROD than in STAGING.If we take a look at the diagram below, we observe that the current method only captures scenario 1.
To capture scenario 2, we need to be smarter. I've been thinking of a logical expression, but I believe there is none. Therefore, the idea now is to track in a table if a conflict was resolved. A conflict will be identified by the chart ID and timestamp of edit in PROD.
*A chart conflict happens when one user edits a chart in PROD and another in STAGING, after branching out. Similar to git-conflict.
Related: https://github.com/owid/owid-grapher/pull/3584