Skip to content

[codex] Add changed clip ID merge mode - #24

Merged
explicit09 merged 1 commit into
mainfrom
codex/fix-atomic-ref-writes
May 21, 2026
Merged

[codex] Add changed clip ID merge mode#24
explicit09 merged 1 commit into
mainfrom
codex/fix-atomic-ref-writes

Conversation

@explicit09

Copy link
Copy Markdown
Owner

Summary

Implements issue #3 by adding reusable vedit-core support for changed clip IDs and a merge path that uses clip-ID overlap instead of track-level conflict semantics.

Changes

  • Parse stable clip IDs from OTIO clip fields/metadata into the core model.
  • Add reusable changed-clip-ID APIs for timeline comparison and Repo::changed_clip_ids(ref) relative to the first parent.
  • Add Repo::merge_changed_clip_ids(source, target, author, message) with structured clean/conflict payloads.
  • Allow same-track non-overlapping clip-ID merges as overlay updates.
  • Return typed overlap conflicts without committing.

Validation

  • cargo fmt
  • cargo test
  • cargo clippy --all-targets -- -D warnings

Closes #3

@explicit09
explicit09 marked this pull request as ready for review May 21, 2026 17:33
@explicit09
explicit09 merged commit d247a07 into main May 21, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

vedit-core: add changed-clip-id merge preflight and non-overlap merge mode

1 participant