I still don’t think it’s nearly as convenient as being able to just see the changes side by side and click the one you want (or both). You can even easily modify the final outcome in the 3rd preview panel, in case you need to do a quick fix after a conflict resolution.
I really wish gimp had a command palette, kinda like the Ctrl+Shift+P thing in VSCode. As a beginner in gimp I often know approximately what I want to do, but not how to find that thing and just being able to type “crop”, “scale”, “add layer” and have it happen would be much easier than having to look for it through various menus.