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

switch to use new diff logic for merge #4594

Merged
merged 14 commits into from
Oct 16, 2024
Merged

switch to use new diff logic for merge #4594

merged 14 commits into from
Oct 16, 2024

Commits on Oct 9, 2024

  1. support relationship properties in merge queries

    @ajtmccarty
    ajtmccarty committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    2a3d896 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. more tests and finish support for relationship properties

    @ajtmccarty
    ajtmccarty committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    03e0ce0 View commit details
    Browse the repository at this point in the history

  2. switch to use new diff logic for merge

    @ajtmccarty
    ajtmccarty committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    0034cba View commit details
    Browse the repository at this point in the history

  3. formatting

    @ajtmccarty
    ajtmccarty committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    0c700a2 View commit details
    Browse the repository at this point in the history

  4. pylint cleanup

    @ajtmccarty
    ajtmccarty committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    15baffa View commit details
    Browse the repository at this point in the history

  5. make sure diff is up to date before merging

    @ajtmccarty
    ajtmccarty committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    cc95487 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'develop' into ajtm-10092024-diff-switch

    @ajtmccarty
    ajtmccarty committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    b40a7ef View commit details
    Browse the repository at this point in the history

  2. add new merge finalizer query to set all the to times on source branch

    @ajtmccarty
    ajtmccarty committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    75b093b View commit details
    Browse the repository at this point in the history

  3. add handling for cardinality-one conflicts to diff merger

    @ajtmccarty
    ajtmccarty committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    587d373 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. fix for NULL handling on boolean attributes

    @ajtmccarty
    ajtmccarty committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2af902c View commit details
    Browse the repository at this point in the history

  2. fix for handling schema changes during merge

    @ajtmccarty
    ajtmccarty committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c727dc9 View commit details
    Browse the repository at this point in the history

  3. formatting

    @ajtmccarty
    ajtmccarty committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    bccf269 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. test and bug fixes

    @ajtmccarty
    ajtmccarty committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    550cee7 View commit details
    Browse the repository at this point in the history

  2. remove code to set "to" timestamp on source branch in merge

    @ajtmccarty
    ajtmccarty committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7596b5d View commit details
    Browse the repository at this point in the history