Github: Jump to conflicting line when clicking on merge conflict panel

[move[bot]]

@j2bbayle commented on Jul 12, 2018, 9:47 PM UTC:

Summary

Atom currently supports detection of merge conflicts and provides a visual way for the user to select the version to keep. In case of merge conflicts, a new section appears on the "Git" right panel to list the various conflicting files. Clicking on one opens up the file in a new tab, but the user has to scroll down until he reaching the conflicting lines... which can be tedious for very long files. A more convenient behavior when clicking a conflicting file in the panel would be to open up the file and jump directly at the first conflicting lines.

Motivation

Version-control workflows including conflict resolution is now integrated to Atom. It is a natural extension to make them as smooth as possible. Moreover this does not seem like a very complicated change to implement.

This issue was moved by rsese from atom/atom#17683.

[rsese]

x-ref: https://github.com/atom/github/issues/812 which was opened about navigating between merge conflicts though there's a comment in there about this particular behavior /cc https://github.com/atom/github/issues/812#issuecomment-303854172.

[GitMurf]

What ever happened on this? Anything? I looked through all these old related issues on jumping through merges/conflicts and ended up just using the suggestion of "Ctrl + F" and searching for "<<<<"... is that really the solution still to this day? Thanks.

[smashwilson]

If it had been fixed, there would be an update here.

This one bugs me, too, so I'd love to get to it, but time is in short supply these days. If you don't want to wait for me to get around to it - I would happily merge a pull request to fix it 😄

[GitMurf]

@smashwilson thanks for update. No worries. All I wanted to know was if there was an update or solution to this that I wasn't able to find. I totally understand priorities changing and list of to do items growing and can't do everything. Hopefully someone will be able to help out but I don't have the coding expertise to help unfortunately :(

[smashwilson]

So, uh, this was a lot easier than I thought it was going to be, so I ended up just fixing it today.

Note that it'll still take a while to percolate through an atom/github release, Atom beta, then Atom stable.