sourcegit
sourcegit copied to clipboard
Add visual indicators for files that was in conflict state during rebase
I made it a rule to double-check the results of the merge of conflicts, since whatever the convenient utility merge is, with a three-way comparison it is difficult to understand the final picture as a whole.
Therefore, after the merge, I double-check the results, opening the usual diff of files in which there were conflicts. However, sourcegit, like most git GUI clients, does not mark files with resolved conflicts in any way and it is difficult to search for them in a commit with dozens of modified files. The only client that shows the status is TortoiseGit. Please highlight files that were in a conflict state, ideally with some color and maybe icon.