Skip to content

Rebase conflict: ht on master (2026-03-11) #12

@marksverdhei

Description

@marksverdhei

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 tools/server/public/index.html.gz

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

22942178510


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