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

Branching #3201

Merged
merged 17 commits into from
Nov 4, 2024
Merged

Branching #3201

merged 17 commits into from
Nov 4, 2024
+1,465 −6

Commits on Nov 2, 2024

  1. add branch table

    @samuelstroschein
    samuelstroschein committed Nov 2, 2024
    Configuration menu
    Copy the full SHA
    6c2a6f9 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. add pointers

    @samuelstroschein
    samuelstroschein committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    f84a9f8 View commit details
    Browse the repository at this point in the history

  2. add jsdoc

    @samuelstroschein
    samuelstroschein committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    9bc853b View commit details
    Browse the repository at this point in the history

  3. switching branches

    @samuelstroschein
    samuelstroschein committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    3bc74a7 View commit details
    Browse the repository at this point in the history

  4. export public api

    @samuelstroschein
    samuelstroschein committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    1bd9322 View commit details
    Browse the repository at this point in the history

  5. add change-in-branch filter

    @samuelstroschein
    samuelstroschein committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    1a9edd0 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. wip merge branch

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    35e7753 View commit details
    Browse the repository at this point in the history

  2. fix: run in transaction

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    2a10d14 View commit details
    Browse the repository at this point in the history

  3. fix: detect diverting entity changes conflict

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    de928b8 View commit details
    Browse the repository at this point in the history

  4. expose v2 apis

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    7d634be View commit details
    Browse the repository at this point in the history

  5. improve: readonly for lowest common ancestor

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    3f4c168 View commit details
    Browse the repository at this point in the history

  6. improve: readonly for lowest common ancestor

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    79adbb1 View commit details
    Browse the repository at this point in the history

  7. add update branch pointers in file handlers

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    77e6347 View commit details
    Browse the repository at this point in the history

  8. update comment

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    7cafa13 View commit details
    Browse the repository at this point in the history

  9. improve: conflicts can't self reference

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    b23e906 View commit details
    Browse the repository at this point in the history

  10. add comment

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    0c2a7ad View commit details
    Browse the repository at this point in the history

  11. add grandparents for re-assurance

    @samuelstroschein
    samuelstroschein committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    2529fcd View commit details
    Browse the repository at this point in the history