feat(actions): Resolve conflicts for the whole file

sindrets / diffview.nvim

Single tabpage interface for easily cycling through diffs for all modified files for any git rev.

Other

3.85k stars 105 forks source link

feat(actions): Resolve conflicts for the whole file #317

Closed 616b2f closed 1 year ago

616b2f commented 1 year ago

Hi there :)

I asked for that functionality and get the advice I should create a PR, so here it comes.

This is my first PR here and also I don't have experience in neovim plugin development, so any tips are welcome and appreciated.

I would also like an advice if I should keep it in a separate funktion "conflict_choose_file()" or merge it into "conflict_choose()", what do you think?

616b2f commented 1 year ago

@sindrets I resolved your comments, if you think I should change anything else, pls let me know.

616b2f commented 1 year ago

done. Thank you so much, for taking the time to help me get this thing done. I learned a lot.