Skip to content

Unable to clearly visualise conflicts #404

Description

@ravisumit33

In the 3-way view, conflicts start and end points are not apparantly visible. In the attached video you can see 2 conflicts are there but there are no signs which show exactly the start and end of each conflict. Signs in the gutter shows changed lines rather than actual conflict range. Thus it makes hard to actually compare between theirs and ours versions. How will I know the range of lines inside a conflict in theirs panel and corresponding in ours panel? Doing ]x individually in both panels seems cumbersome. Is there a config which I can use to better visualize conflicts?

Screen.Recording.2026-05-31.at.12.08.43.PM.mov

Something like below can help but doesn't look elegant. There should be a better way of achieving this.

Image

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