https://www.boundaryml.com logo
🟡 Handling Merge Conflicts in BAML Files
# questions
m
How do folks handle multiple people editing different BAML files in the same repo? We have perpetual merge conflicts on inlinedbaml.py and curious if we're just doing something wrong here 🙂 https://cdn.discordapp.com/attachments/1253172394345107466/1483517576448577606/image.png?ex=69bae0e8&is=69b98f68&hm=5f9f0ff8d5fd70252819c82b4ca34334255b6527c568696ddaf0703a202b0798&
v
don't check in baml_client 🙂
we recommend running baml-cli on prod machines (similar to how in TS code you don't check in JS)
m
woah super interesting... too bad we don't use docker in prod rn... so then do we still get the BAML logs and stuff? or we would just have to log that sidecar too
a
yeah i usually just gitignore and then add to whatever build script i have for the repo
v
yep!
how are you deploying? happy to get you set up so you don't have to merge in
baml_client
@Matt
agree with @Anders here 🙂
m
we just have Render cloud start our python process. we run our full service in CI in docker, so it's a hop and skip to set this up actually. Plus i want to set up trymightyai for their prompt injection tooling. and worst case we can use sub-process in the short term (though I see you may deprecate that)
a
If you can find a way to just run the
baml generate
command in CI and gitignore you'll be better off. I'm not familiar with how Render does python app deployments
m
Thanks! Yeah it actually should be easy to set up with Render. the agents are on it