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
Rebase Conflict:
htonmasterThe automated rebase of
htonto the latestmaster(synced fromggml-org/llama.cpp) failed due to conflicts.Conflicting Files
Manual Resolution Steps
git fetch origin git checkout ht git rebase origin/master # Resolve conflicts... git rebase --continue git push --force-with-lease origin htWorkflow Run
26023085674
Automated by fork-sync workflow