0
Conflict Solver: Highlight actual changes
When I open Conflict Solver, in numerous cases it overwhelms me with lots of unrelated changes because files were changed a lot. There may be only a few lines actually changed in the commit, but I see so many colorful lines showing the differences between ours/theirs and the merge result that it's difficult to understand what's going on without looking at the original commit. It's a confusing experience.
It would be great if all changes not relevant to the applied commit (as a result of cherry-picking, rebase, etc.) were somehow (optionally) highlighted. For example, irrelevant changes might be in muted colors.
Customer support service by UserEcho
Please create a sample repository with a conflict on merge/rebase and share your expected output.
ConflictSample.zip
Try to rebase branch change/HappenedAgain onto master and see how colorful "theirs" is. There are only two lines that actually changed in the rebased branch, but there are so many colored lines that I have to click "Base Changes" to figure out what happened. This sample is small and easy to understand, but real projects contain files with more than a hundred lines, and when there are a lot of colored lines, it's difficult to figure out what's going on.
So you want to have a mode where the non-conflicting changes be not colored?
Non-conflicting changes not related to the rebased commit directly. They may be colored in muted colors, so the information is still there, but not confusing.