Skip to content

Rebase conflict: ht on master (2026-05-18) #51

@marksverdhai

Description

@marksverdhai

Rebase Conflict: ht on master

The automated rebase of ht onto the latest master (synced from ggml-org/llama.cpp) failed due to conflicts.

Conflicting Files

CONFLICT (content): Merge conflict in convert_hf_to_gguf.py

Manual Resolution Steps

git fetch origin
git checkout ht
git rebase origin/master
# Resolve conflicts...
git rebase --continue
git push --force-with-lease origin ht

Workflow Run

26023085674


Automated by fork-sync workflow

Metadata

Metadata

Assignees

No one assigned

    Labels

    sync-conflictUpstream sync rebase conflict

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions