I find VSCode/Codium to be even better at that! And worst case, open up the terminal and do the job there.

Even merging which was often an annoying endeavour is quite smooth there.