For comments: weave bundles doc comments (JSDoc, ///, /* */, etc.) with the entity they belong to. So if one branch edits a doc comment and another edits the function body, they merge as part of the same entity. Standalone comments between functions are treated as interstitial text and merge normally.

Thanks for notifying, I will update it. So we use a language specific parser called sem here:https://ataraxy-labs.github.io/sem/, you can use all the languages listed here in weave, its a seperate library. So if you want to add language support you can open a PR here.