Resolve Merge Conflict #33
Description
The best thing about BC is its ability to resolve merge conflicts. This is the most stressful thing that can happen using git and my goto used to be SmartGit with BC as the diff and merging tool. I use BC at home and work and I still think its #1 due to the level of control and clarity of the visualisation. Could the VS code plugin not be extended to support conflict resolution?