Conflict Resolution Audit Tools

Hello,

I'm a junior dev with 2 years of professional experience and a SmartGit subscription.

While working on merge conflicts, I've noticed time after time that it would be immensely valuable to have a record of how each conflict was solved if just for some peace of mind and avoid finger pointing when a bug appears. The problem is that when a merge commit is created after resolving conflicts, Git doesn't keep track of several key pieces of info:

1- How many conflicts were there initially?
2- Which files were affected?
3- Which specific lines of a given file were in conflict?

4- How were the different conflicts solved?

Now, what's great about SmartGit is that when creating a merge commit a comment addressing point 2 is already being included. This is great! But I think we can do much better.

I have 3 propositions:

1- Generate a "Conflict Resolution Report: Upon creating the merge commit, it would be fantastic if SmartGit could export a detailed report for each conflicted file. A simple screenshot for each conflict could be a start/additional option.  A more useful text-based format like a .diff patch or an interactive HTML file, clearly highlighting what the conflict was and how it was solved would be even better since you never know what the user has on the screen during a screen capture. This would create an invaluable artifact for code reviews and future debugging. Even more powerful the ability to attach a comment to each change so that future me and other devs can quickly understand the reasoning behing complex decisions.

2- Record Resolution button: As an additional or alternative option, a "Record Resolution" button could be provided to trigger a video capture of the entire conflict resolution process, from the moment the user enters the Conflict Solver to the final save. This creates a high-fidelity audit trail and a last-resort backup of the decisions made. Even more, the trigger could set to be automatic. Every time I enter conflict resolver Smartgit would automatically trigger the recording. This way I don't always have to remember clicking the btn.

3- Built-in Conflict Recreation: Provide a way to "re-experience" a past merge conflict from the log. If a problem arises, I could select a merge commit, and SmartGit could instantly recreate the original conflict state in the Conflict Solver.

You could be the ones to implement all this, an entire system to audit each merge conflict.