I opened my first Tangled PR: https://tangled.org/str4d.xyz/atproto-devtool/pulls/1/round/0
The PR's branch is directly based on main, and I confirmed locally that it can be merged cleanly. However, the Tangled UI has disabled the merge button and shows a merge conflicts detected warning. But clicking "expand" shows nothing. The HTML node is rendered as:
<details class="group/conflict">
<summary class="flex items-center justify-between cursor-pointer list-none">
<div class="flex items-center gap-2 ">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-red-600 dark:text-red-500 w-4 h-4">
<path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3"></path>
<path d="M12 9v4"></path>
<path d="M12 17h.01"></path>
</svg>
<span class="font-medium">merge conflicts detected</span>
<div class="text-sm text-gray-500 dark:text-gray-400">
<span class="group-open/conflict:hidden inline">expand</span>
<span class="hidden group-open/conflict:inline">collapse</span>
</div>
</div>
</summary>
</details>
thanks for the report! have identified the bug, will fix this up soon and release a new revision of the knotserver.