Skip to content

Smarter git conflict resolution #12

@fyang0507

Description

@fyang0507

Handle rebases, merge conflicts, or divergent histories in the data repo.

Why deferred from v1

v1 does simple commit + best-effort push. Conflict resolution requires understanding the merge semantics of schedule JSON files.

v1 baseline

Best-effort push. If push fails, commit stays local and next push includes all pending commits.

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or requestportabilitySync, export/import, git conflict handling

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions