#0.17.0-llm.5 🧵
1 messages · Page 1 of 1 (latest)
Merging main...
No surprise I'm getting merge conflicts. What's the current playbook for those @high plover ?
going to leave it alone for now
@teal dove pushed a merge of main into llm
wasn't too bad (1 hunk), but rebase failed on the very first commit so i kicked the can down the road and went with merge 😛
maybe we just keep merging, it'll all be squashed anyway
I'm fine with that - the issue is that even merge had conflicts, and at this point I can't tell if it's the "normal" or "don't bother" variety
@high plover could I get a quick merge of main 🙏 then I'll tag llm.5 and push it
done
Publish fail 😦 https://github.com/dagger/dagger/actions/runs/13661024669
looks like it was interrupted? can't find anything beyond that in the trace
maybe just rerun
re-running