Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip duplicate data during copy from one catalog to another #737

Merged
merged 7 commits into from
May 10, 2024
Merged

Skip duplicate data during copy from one catalog to another #737

merged 7 commits into from
May 10, 2024

Commits on May 7, 2024

  1. Add basic duplicate checking to sync.copy

    @pbeaucage
    pbeaucage authored and RobotoStation committed May 7, 2024
    Configuration menu
    Copy the full SHA
    7e39ffe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/pbeaucage/tiled into sync

    @pbeaucage
    pbeaucage authored and RobotoStation committed May 7, 2024
    Configuration menu
    Copy the full SHA
    0dce286 View commit details
    Browse the repository at this point in the history

  3. fix lint

    @pbeaucage
    pbeaucage authored and AFL committed May 7, 2024
    Configuration menu
    Copy the full SHA
    a77e6e4 View commit details
    Browse the repository at this point in the history

  4. Gate error override behind skip_duplicates flag

    @pbeaucage
    pbeaucage authored and AFL committed May 7, 2024
    Configuration menu
    Copy the full SHA
    e3760d1 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Change skip_duplicates to on_conflict

    @pbeaucage
    pbeaucage authored and AFL committed May 8, 2024
    Configuration menu
    Copy the full SHA
    b3fe178 View commit details
    Browse the repository at this point in the history

  2. Add changelog entry for conflict handling

    @pbeaucage
    pbeaucage authored and AFL committed May 8, 2024
    Configuration menu
    Copy the full SHA
    7aa1d02 View commit details
    Browse the repository at this point in the history

  3. Add tests for conflict behavior on copy

    @pbeaucage
    pbeaucage authored and AFL committed May 8, 2024
    Configuration menu
    Copy the full SHA
    461b4a0 View commit details
    Browse the repository at this point in the history