Skip to content

Feature Request: Show Potential Merge Conflicts #144

Description

@jatin-code777

Description

Git Tree Compare provides an excellent local preview of the files and diffs that would appear in a pull request. However, one important piece of information is currently missing: whether the branch can be cleanly merged into the target branch.

When reviewing a branch before creating a PR, I often want to know not only what the diff looks like, but also whether merging into the target branch would result in conflicts.

Proposed Feature

Add an option to perform a merge simulation against the selected target branch and surface any potential merge conflicts.

Possible UX ideas:

  • Show a warning banner when conflicts are detected.
  • Display a "Mergeable" / "Conflicts Detected" status in the tree view.
  • Highlight conflicted files in the file tree.
  • Provide a command such as "Check Mergeability".

Motivation

The extension is already very close to being a complete local PR preview experience. Knowing ahead of time whether the branch can be merged cleanly would help users:

  • Resolve conflicts before opening a PR.
  • Avoid CI failures or blocked reviews.
  • Better match the information shown by hosting platforms such as GitHub.

Oh and, Thanks for the great extension!!

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions