Skip to content

Resolve Merge Conflict #33

Description

@JasonAtDrumBrae

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?

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions