{"type":"video","version":"1.0","html":"<iframe src=\"https://www.loom.com/embed/8f6b415cdac046aa8f1ef0b8a5a237e4\" frameborder=\"0\" width=\"1742\" height=\"1306\" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>","height":1306,"width":1742,"provider_name":"Loom","provider_url":"https://www.loom.com","thumbnail_height":1306,"thumbnail_width":1742,"thumbnail_url":"https://cdn.loom.com/sessions/thumbnails/8f6b415cdac046aa8f1ef0b8a5a237e4-612c4c52c0941be2.gif","duration":144.98,"title":"Managing Code Conflicts in Parallel Development 🚧","description":"In this video, I discuss the challenges we faced with conflicting code changes from multiple AI coding agents working on the same repository. Agent Bob's recent pull request, while clean and passing CI, encountered 22 breaking conflicts with other branches, particularly due to changes in the 'create order' function requiring three arguments instead of two. I've highlighted specific lines in the code where these issues arise, including cross-language conflicts in Python and Ruby. It's crucial that we address these conflicts before merging to avoid crashes in production. Please review the highlighted lines and ensure your branches are aligned with the updated function signatures."}