[scottpersinger]

I’d just like to put a pitch in here for someone to do “smart rebase+merge” with AI. Now THAT would really speed up development, if my AI was intelligently merging code from different users in the background, based on understanding the intent behind each conflicting change.

[weird-eye-issue]

You can do that with Claude Code. Just tell it to merge in another branch and fix the merge conflicts.

[bbe327]

I didn’t know that. Thank you for the info. It’s been annoying. Will hail Claude Code. Hoorays

[bhaktatejas922]

how often do you run into merge conflicts?