0

Give access to conflict solver even on non-conflicted files

griscom 2 years ago updated 2 years ago 1

I'm doing a complex merge between two branches. The five files with conflicts let me use the Conflict Solver to compare the two source branches to the mis-merged file, so I was able to resolve and stage the issues. Now, though, I have 365 changed, staged files, and I'd like to review the changes. I can see how they differ from the previous version of the master branch, but there's no way to see how they differ from the merged branch.

I'd like to access the Conflict Solver, but it's dimmed out. Even if I un-stage the files, it's still dimmed out.

Please allow use of the Conflict Solver on any file during a merge. Ideally I wouldn't have to un-stage each file to use it, but ideally I'd also be able to edit the merged file; not sure how you'd make both options possible.

To see the changes against the merged branch, please select the working tree and the latest commit of the merged branch.

That will compare the working tree with the merged branch, but not show anything about the target branch. In otherwise, it just shows two file states and their differences. (right?)

The "Conflict Solver" shows three file states: the merged branch, the target branch, and the working tree in the middle. I can see where any change came from, and what's different from either source. Would be very useful.