#getting to merge

1 messages ยท Page 1 of 1 (latest)

wispy field
#

@marsh lintel ๐Ÿ‘‹

#

where is the conflict ? do you need help?

marsh lintel
#

not doing any big refactoring - the biggest thing i've done is cleared up some dead code and renamed some variables

#

nahhh, it's all in the auto-gened code

#

almost done

#

what's the incoming merge conflict?

wispy field
#

I removed bbi/

marsh lintel
#

oh lol uh, where's it gone ๐Ÿ‘€

#

but yes, that'll be fun

wispy field
#

a much smaller llm_env.go

#

not done yet

marsh lintel
#

oh fine! yeah, if you hit merge conflicts, happy to help solve those (if you push it somewhere)

wispy field
#

slight schema change in LlmMiddleware

marsh lintel
#

yee, no worse than the other ones today

#

pushed!

#

linting should be passing now

marsh lintel
wispy field
#

yeah it was dead code for sure

#

thanks

wispy field
#

@jed my wip branch is pushed on my fork if you want

marsh lintel
#

oop, will not get time to look anymore at this today (or this week actually, since i'm off tomorrow and this weekend to show my cousins round my home town)
but if it's not done before then, i'll pick it up when immediately when i get back!

marsh lintel