search

julienvincent / hunk.nvim

A tool for splitting diffs in Neovim
MIT License
94 stars 4 forks source link

Add ability to use as jj merge tool as well #6

Open garymjr opened 2 months ago

garymjr commented 2 months ago

Hey @julienvincent, thanks for this plugin it works great. I was wondering if you had considered extending this to support commands like `jj resolve as well?

julienvincent commented 2 months ago

Hey, glad you like it!

Yes I do plan to add a conflict resolution component when I get some time.

Should be relatively simple to add on top of what's been built here!

julienvincent commented 2 months ago

Also for those interested there is https://github.com/rafikdraoui/jj-diffconflicts - which I'd like to take some inspiration from.

I don't entirely like the way it's done in that plugin but I think some of the core ideas are good.

I like that there is a history view with a three-way diff. This will make interpreting a diff much easier.

I think I'd maybe want some way to select lines from left and right (using the selection tools from hunk.nvim) and then a way to edit the final result.

Not yet sure how this will work.

garymjr commented 2 months ago

Awesome! Thanks for pointing out that plugin as well. I'm fairly new to jujutsu so I'm still finding all the extra tooling around it.