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

octopus-merge (part 2: blob-merge) #1585

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

octopus-merge (part 2: blob-merge) #1585

wants to merge 6 commits into from
+2,288 −7

Commits on Sep 11, 2024

  1. add performance notes related to an arena-backed internet BString com… 

    …patible type
    @Byron
    Byron committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    748fafd View commit details
    Browse the repository at this point in the history

  2. add the gix-merge crate for capturing merge algorithms

    @Byron
    Byron committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    1d3d258 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. feat: Add blob::pipeline::WorktreeRoots::is_unset() 

    That way it's easy to determine if a worktree root has any root set.
    @Byron
    Byron committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    ea95284 View commit details
    Browse the repository at this point in the history

  2. use new WorktreeRoot API provided by gix-diff

    @Byron
    Byron committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    865282f View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Sketch the entire API surface to capture all parts of blob-merges

    @Byron
    Byron committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    b96d11f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Implement text and binary merge algorithms, also with baseline te… 

    …sts for correctness.
    @Byron
    Byron committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    b09092c View commit details
    Browse the repository at this point in the history