0
In the Base Changes screen, show the blame for each line in the margin
When resolving conflicts, I love using the "Base Changes" screen to figure out what each string of commits changed. It would be helpful, however, to see who made those changes and why.
Customer support service by UserEcho
Did you already try "Investigate"?
Yes, I love the "Investigate" feature, and use it often.
But that's too heavy-handed for the "Base Changes" screen when just resolving a merge/rebase conflict. You'd have to invoke "Investigate" on the conflicted file, then find each of the conflicting commits (even harder when doing an interactive rebase), then find the exact line numbers in each where the conflict occurred, and repeat this for each commit and each block of conflicting lines. Very fiddly. Lots of manual searching for commit SHAs and line numbers.
Compare to the feature I'm suggesting:
1. Double-click the conflicted file in the Files view.
2. Click "Base Changes" in the toolbar of the Conflict Solver.
3. Click "Blame" in the toolbar to see the blame info (last change) in the margins of the left and right panes.
4. If needed, select a line to see a list of all changes since the base commit a pane at the bottom.