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

Update gix to the latest released version for bugfixes. #5657

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Update gix to the latest released version for bugfixes. #5657

merged 3 commits into from
Nov 26, 2024

Commits on Nov 26, 2024

  1. Update gix to the latest released version for bugfixes. 

    The fix include:

* ability to find references that are all uppercase.
* `tree_merge_options()` now correctly configure rename tracking.
    - Previously it was deactivated entirely, which would yield worse conflict resolution.
    @Byron
    Byron committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    a89331f View commit details
    Browse the repository at this point in the history

  2. Fix windows build 

    The issue itself seems to be unrelated though.
    @Byron
    Byron committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    6b693b0 View commit details
    Browse the repository at this point in the history

  3. No need for rename tracking if all we need is a conflict check. 

    Rename tracking can help with conflict resolution, but in cases
where we only care about detecting conflicts, rename-tracking should be off.
    @Byron
    Byron committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    ddee7de View commit details
    Browse the repository at this point in the history