jj-diffconflicts

jj-diffconflicts copied to clipboard

Idea for how it could play nicer with formatters & linters

1

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...

trcoffman

It would be nice to have syntax highlighting on the "snapshot" buffer. I believe it should just be setting the filetype to be the left pane, will see if I...

ejrichards

Without this, the message is cleared before the UI is fully initialized. This also allows us to use the default INFO log level. Previously, using WARN level was required to...

rafikdraoui

How to delete a file?

1

There are cases where one side of the conflict modified some file, while the other side completely removed the file. How to take the removal as the outcome?

marcinjahn