Skip to content

Actions: headroomlabs-ai/headroom

Actions

Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
2,500+ workflow runs
2,500+ workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
deps: bump ruff from 0.16.2 to 0.16.3 in the pip-minor-patch group Merge Conflicts #4933: Pull request #3143 synchronize by JerrettDavis
58s dependabot/pip/pip-minor-patch-e904d59df0
dependabot/pip/pip-minor-patch-e904d59df0
58s
deps: update mcp requirement from <2.0.0,>=1.28.1 to >=1.28.1,<3.0.0 Merge Conflicts #4932: Pull request #3144 synchronize by JerrettDavis
12s dependabot/pip/mcp-gte-1.28.1-and-lt-3.0.0
dependabot/pip/mcp-gte-1.28.1-and-lt-3.0.0
12s
deps: bump md-5 from 0.10.6 to 0.11.0 Merge Conflicts #4931: Pull request #3146 synchronize by JerrettDavis
11s dependabot/cargo/md-5-0.11.0
dependabot/cargo/md-5-0.11.0
11s
feat(proxy): serve on a Unix domain socket (--uds) Merge Conflicts #4930: Pull request #3151 synchronize by Ayushraj06-bit
1m 8s Ayushraj06-bit:feat/proxy-uds-1779
Ayushraj06-bit:feat/proxy-uds-1779
1m 8s
feat(release): define qualification evidence contracts Merge Conflicts #4929: Pull request #2961 synchronize by JerrettDavis
52s JerrettDavis:jd/release-evidence-contracts
JerrettDavis:jd/release-evidence-contracts
52s
fix(proxy): skip pricing lookup for passthrough:* models Merge Conflicts #4928: Pull request #2585 synchronize by JerrettDavis
21s axelray-dev:fix/passthrough-pricing-skip
axelray-dev:fix/passthrough-pricing-skip
21s
feat(proxy): lazy memory embedder warmup + /debug/rss endpoint (memory-arch-v2) Merge Conflicts #4927: Pull request #623 synchronize by JerrettDavis
10s neogenix:feat/memory-architecture-v2
neogenix:feat/memory-architecture-v2
10s
fix(proxy/streaming): tolerate malformed upstream SSE events Merge Conflicts #4926: Pull request #2558 synchronize by JerrettDavis
Action required nkamali:fix/streaming-malformed-sse-events
nkamali:fix/streaming-malformed-sse-events
Action required
chore: release 0.36.2 Merge Conflicts #4925: Pull request #3157 synchronize by JerrettDavis
13m 13s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
13m 13s
chore: release 0.36.2 Merge Conflicts #4924: Pull request #3157 opened by JerrettDavis
2m 47s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
2m 47s
chore: release 0.36.1 (#3152) Merge Conflicts #4923: Commit 37faf2f pushed by chopratejas
24s main
main
24s
feat(proxy): serve on a Unix domain socket (--uds) Merge Conflicts #4922: Pull request #3151 synchronize by Ayushraj06-bit
10s Ayushraj06-bit:feat/proxy-uds-1779
Ayushraj06-bit:feat/proxy-uds-1779
10s
feat(proxy): serve on a Unix domain socket (--uds) Merge Conflicts #4921: Pull request #3151 synchronize by Ayushraj06-bit
10s Ayushraj06-bit:feat/proxy-uds-1779
Ayushraj06-bit:feat/proxy-uds-1779
10s
fix(install): make install status agree with doctor when the proxy is reachable (#3072) Merge Conflicts #4920: Pull request #3141 synchronize by veerareddyvishal144
Action required veerareddyvishal144:fix/3072-status-doctor-consistency
veerareddyvishal144:fix/3072-status-doctor-consistency
Action required
fix(cache/ccr): tolerate a malformed CCR entry row instead of crashing the store Merge Conflicts #4919: Pull request #3156 opened by abhay-codes07
10s abhay-codes07:fix/ccr-sqlite-tolerate-malformed-entry-row
abhay-codes07:fix/ccr-sqlite-tolerate-malformed-entry-row
10s
fix(integrations): record metric timestamps in UTC, not naive local time Merge Conflicts #4918: Pull request #3117 synchronize by abhay-codes07
26s abhay-codes07:fix/integrations-metric-timestamp-utc
abhay-codes07:fix/integrations-metric-timestamp-utc
26s
feat(leanctx): pure-Python window-based context truncation + request coalescer Merge Conflicts #4917: Pull request #1460 synchronize by JerrettDavis
10s peterlodri-sec:feat/window-truncator-leanctx
peterlodri-sec:feat/window-truncator-leanctx
10s
feat(mcp): register headroom MCP server with dsh (DeepSeek Harness) Merge Conflicts #4916: Pull request #3036 synchronize by Zenjibad
Action required Zenjibad:feat/dsh-mcp
Zenjibad:feat/dsh-mcp
Action required
chore: release 0.36.1 Merge Conflicts #4915: Pull request #3152 synchronize by JerrettDavis
52s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
52s
chore: release 0.36.1 Merge Conflicts #4914: Pull request #3152 synchronize by JerrettDavis
1m 6s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
1m 6s
fix(metrics): attribute tool-schema savings per model, not just compr… Merge Conflicts #4913: Commit 81fe9d5 pushed by chopratejas
3m 4s main
main
3m 4s
chore: release 0.36.1 Merge Conflicts #4912: Pull request #3152 synchronize by JerrettDavis
33s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
33s
chore: release 0.36.1 Merge Conflicts #4911: Pull request #3152 synchronize by JerrettDavis
10s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
10s
fix(docker): give :latest exactly one writer (#3154) Merge Conflicts #4910: Commit bf651c3 pushed by chopratejas
11s main
main
11s
fix(proxy): gate tool schema compaction opt-in Merge Conflicts #4909: Pull request #2256 synchronize by JerrettDavis
12s JerrettDavis:jd/gate-merged-behavior-hardening
JerrettDavis:jd/gate-merged-behavior-hardening
12s