Merge hints need more guidance

Feature Requests
1

What I’m trying to do:

Handle merge conflicts. It gives me some guidance on what the two conflicting sections of code have in them, but is missing an indicator about where the version I’m merging ends.

Here’s an example:

image

The version I’m merging in that is only the one line (the line that was in both versions but commented out in one). But there’s nothing visual that shows me where that version’s content ends. Every merge conflict I need to analyze both sections of code to try to guess where the version I’m merging part ends. It seems like it should be possible to drop an indicator there.

2 Likes
2

I just had this recently, and I agree. Using git or WinMerge on my own desktop, I can tell where the difference ends. This is critical information about the difference.

3 Likes
3

Hi @jshaffstall,

Good point - I’ve added it to our list.

Ryan

1 Like