Verified record · from the answer index

pull-changes-resolve-conflicts

Standard workflow for pulling updates from main or other branches on multi-contributor projects (including Flows apps) without silently discarding work. Guides fetching/merging, requires listing merge conflicts explicitly, analyzing ours vs

skill:cognitedata/builder-skills/pull-changes-resolve-conflicts · published by cognitedata · source repository