Fedor Sheremetyev

Just for reference, here is parsing of conflict markers in VSCode: https://github.com/microsoft/vscode/blob/main/extensions/merge-conflict/src/mergeConflictParser.ts Note that it supports multiple blocks separated by `|||||||`, which could be used to represent multi-side conflicts

We might be able to get away with a smaller lock than whole operation. it looks like most of the divergence is coming from a race on Git HEAD -...

Workspace snapshotting is already protected by a lock, #7895 just includes interaction with Git HEAD under the same lock. Regarding performance concerns - probably increasing `settle` parameter in [Watchman config](https://facebook.github.io/watchman/docs/config#settle)...

@matts1, the fix for Git HEAD landed - would be great if you could install `jj` from latest `main` and see if the original problem with watchman still reproduces. Thanks!

Thanks for testing @matts1! There was [discussion](https://github.com/jj-vcs/jj/pull/7895#discussion_r2518231667) of potential deadlock from the use of two locks but I'm not sure that is it yet. Are you able to reproduce `jj`...

> It makes sense that it hangs _after_ a stray lock file is left on disk due to ^C, right? That's my understanding of what happened. I haven't been able...