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
test: track active LiteLLM DeepSeek pricing (#3161) Merge Conflicts #4966: Commit 1bea0ea pushed by JerrettDavis
4m 11s main
main
4m 11s
fix(kompress): accept ccr_original on the remote compressor Merge Conflicts #4965: Pull request #3162 opened by chopratejas
10s fix/remote-kompress-ccr-original
fix/remote-kompress-ccr-original
10s
test: track active LiteLLM DeepSeek pricing Merge Conflicts #4964: Pull request #3161 opened by JerrettDavis
12s JerrettDavis:fix/litellm-upstream-deepseek-pricing
JerrettDavis:fix/litellm-upstream-deepseek-pricing
12s
deps: bump typescript from 5.9.3 to 7.0.2 in /docs Merge Conflicts #4963: Pull request #2278 synchronize by JerrettDavis
4m 26s dependabot/npm_and_yarn/docs/typescript-7.0.2
dependabot/npm_and_yarn/docs/typescript-7.0.2
4m 26s
deps: bump typescript from 5.9.3 to 7.0.2 in /sdk/typescript Merge Conflicts #4962: Pull request #2282 synchronize by JerrettDavis
13s dependabot/npm_and_yarn/sdk/typescript/typescript-7.0.2
dependabot/npm_and_yarn/sdk/typescript/typescript-7.0.2
13s
chore: release 0.36.2 Merge Conflicts #4961: Pull request #3157 synchronize by JerrettDavis
1m 17s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
1m 17s
chore: release 0.36.2 Merge Conflicts #4960: Pull request #3157 synchronize by JerrettDavis
2m 12s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
2m 12s
fix(anthropic): preserve Claude tool search in token mode Merge Conflicts #4959: Pull request #3160 opened by rodboev
6m 21s rodboev:pr/2584-claude-token-tool-search
rodboev:pr/2584-claude-token-tool-search
6m 21s
chore: release 0.36.2 Merge Conflicts #4958: Pull request #3157 synchronize by JerrettDavis
25s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
25s
deps: bump typescript from 5.9.3 to 7.0.2 in /plugins/opencode (#2280) Merge Conflicts #4957: Commit a382137 pushed by JerrettDavis
50s main
main
50s
chore: release 0.36.2 Merge Conflicts #4956: Pull request #3157 synchronize by JerrettDavis
2m 15s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
2m 15s
deps: bump typescript from 5.9.3 to 7.0.2 in /plugins/openclaw (#2279) Merge Conflicts #4955: Commit 85774fc pushed by JerrettDavis
4m 38s main
main
4m 38s
deps: bump tree-sitter from 0.25.2 to 0.26.12 Merge Conflicts #4954: Pull request #3159 synchronize by JerrettDavis
2m 8s dependabot/cargo/tree-sitter-0.26.12
dependabot/cargo/tree-sitter-0.26.12
2m 8s
feat(pricing): add custom model pricing, 4-tier cost calculator, and provider cost extraction Merge Conflicts #4953: Pull request #2418 synchronize by Yaduttam95
Action required Yaduttam95:feat/custom-model-pricing-fallback
Yaduttam95:feat/custom-model-pricing-fallback
Action required
chore: release 0.36.2 Merge Conflicts #4952: Pull request #3157 synchronize by JerrettDavis
18s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
18s
chore: release 0.36.2 Merge Conflicts #4951: Pull request #3157 synchronize by JerrettDavis
1m 30s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
1m 30s
deps: bump ai from 6.0.149 to 7.0.59 in /docs (#2277) Merge Conflicts #4950: Commit f7e5d37 pushed by JerrettDavis
1m 12s main
main
1m 12s
chore: release 0.36.2 Merge Conflicts #4949: Pull request #3157 synchronize by JerrettDavis
5m 48s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
5m 48s
chore: release 0.36.2 Merge Conflicts #4948: Pull request #3157 synchronize by JerrettDavis
16s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
16s
deps: bump md-5 from 0.10.6 to 0.11.0 (#3146) Merge Conflicts #4947: Commit c6dd823 pushed by JerrettDavis
29s main
main
29s
deps: bump ruff from 0.16.2 to 0.16.3 in the pip-minor-patch group (#… Merge Conflicts #4946: Commit c8db13d pushed by JerrettDavis
18s main
main
18s
deps: bump ai from 6.0.138 to 7.0.59 in /sdk/typescript (#2281) Merge Conflicts #4945: Commit 0891062 pushed by JerrettDavis
36s main
main
36s
deps: bump tree-sitter from 0.25.2 to 0.26.12 Merge Conflicts #4944: Pull request #3159 opened by dependabot Bot
11m 36s dependabot/cargo/tree-sitter-0.26.12
dependabot/cargo/tree-sitter-0.26.12
11m 36s
chore: release 0.36.2 Merge Conflicts #4943: Pull request #3157 synchronize by JerrettDavis
1m 8s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
1m 8s
chore: release 0.36.2 Merge Conflicts #4942: Pull request #3157 synchronize by JerrettDavis
17s release-please--branches--main--components--headroom-ai
release-please--branches--main--components--headroom-ai
17s