andros
I am happy to announce that conflict-buttons.el is on MELPA

https://git.andros.dev/andros/conflict-buttons.el

#emacs #git
Mar 2 at 8:18amWeb
Show threadOmar AntolínMar 2
@andros Conflict-buttons sounds like the name of a particularly ornery cat.
Show threadandrosMar 2
@oantolin 😹😹😹
Show threadvisuweshMar 3
@andros with smerge-mode, you can just right click on the conflict to bring up the context menu
Show threadandrosMar 4
@viz Then with my script you save yourself a click 😄