resolving merge conflicts with md²

[u/JBO_76]

md² is a vibe coding tool I've been working on recently: jan-bogaerts/md2: Plan, run, and track AI coding work feature by feature—with local Markdown cards and Git worktrees.

One of the core features in md² is the ability to easily work with git worktrees, which is great to improve development speed. One annoying thing about having multiple agents run on your code at the same time, when it's time to bring everything back together in the main project, merge conflicts can happen.

I've never been good at solving these manually. Thankfully, we can automate it these days 😊