Skip to content

fix(gh-workflows): handle tree-level merge conflicts in upstream sync - #98

Merged
mateo-di merged 2 commits into
carto/mainfrom
fix/upstream-sync-tree-level-conflicts
Mar 16, 2026
Merged

fix(gh-workflows): handle tree-level merge conflicts in upstream sync#98
mateo-di merged 2 commits into
carto/mainfrom
fix/upstream-sync-tree-level-conflicts

feat(gh-workflows): add conflict classification and post-resolution v…

b01105e
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar