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

more merge features #1661

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

more merge features #1661

wants to merge 5 commits into from

Commits on Nov 15, 2024

  1. feat: when blob-merging, clarify if something would have conflicted.

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

  2. feat!: Add more modes for checking for unresolved conflicts. 

    They aim at making it possible to know if a conflict happened that was
automatically resolved.
    @Byron
    Byron committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    e05b42a View commit details
    Browse the repository at this point in the history

  3. adapt to changes in gix-merge.

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

  4. add a note about remote-helpers in crate-status (#1666) 

    `gix-protocol` should support it one day, probably with a
crate implementing the protocol, which is then used from
the functionsin the crate. Ideally abstracting it fully.
    @Byron
    Byron committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    465e4b1 View commit details
    Browse the repository at this point in the history

  5. feat: provide a way to record and apply index changes. 

    These changes will then be applicable to an index that is created
from the written tree editor.
    @Byron
    Byron committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    d4b718b View commit details
    Browse the repository at this point in the history