You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
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
theirsandoursversions. How will I know the range of lines inside a conflict intheirspanel and corresponding inourspanel? Doing]xindividually 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.