I would love if it were possible to enable the following behaviors when working in the 3-pane merging view (either via a separate buttons or a preference toggle or something):
- Save and resolve next conflict (so I click Save, it saves the merged changes I’ve chosen, and then immediately opens a new 3-pane merge resolution view for the next conflicted file instead of returning me to the Working Directory view)
- Save and stage (so I click Save, it saves the merged changes I’ve chosen, and immediately stages the file)
I typically find myself reviewing all changes in the 3-pane view when I’m resolving a conflict, so it doesn’t make a lot of sense to need to jump back to the 3-pane view to explicitly stage the file and then select the next file.