rafikdraoui
Idea for how it could play nicer with formatters & linters
When I resolve files in jj-diffconflicts.nvim, My prettier configs don't apply because the files being edited to resolve conflicts are in some other temporary directory.
I was thinking that perhaps it could put the temporary files inside the repo itself, and then add a pattern to .git/info/exlude so that these files are ignored by jj and git. This would only work for colocated repos though so perhaps it would be not the default behavior.
This way when you save the file when done resolving conflicts, conform.nvim will work just like it would for any other file in the project.
The files being in a separate temporary directory comes from the way jj resolve works. It expects change to be made to the output_* file in order to reconcile the conflict in the repo. As far as I can tell, this is an internal implementation detail of jj resolve, and so directly interacting with them might be fragile, if Jujutsu changes the way it works.
An alternative idea might be to try to tell the formatters that they should be using the configuration from the repository and/or cwd. For example, maybe the formatting tool could detect that a conflict is being resolved, and then when this happens, it would run prettier --config /path/to/.prettierrc instead of prettier?
A workaround is to open the file directly instead of using jj resolve, and manually run :JJDiffConflicts. This runs the jj-diffconflicts directly on the file in the repo. But this isn't as ergonomic as jj resolve, especially if multiple files are conflicted.
