github
github copied to clipboard
atom
Navigation between merge conflicts
From smashwilson/merge-conflicts#267:
Quite possible I missed something visually while using this tool. If that is the case, just let me know.
I had two conflicts in the same file. I clicked on the "use ours" button. The update to the file was made in atom's buffer. I was completely clueless how to move to the next conflict quickly. I did not see a button the footer UI and scrolling wasn't really an option as there were a few thousand lines between the different conflicts. I ended up needing google to get me to atom.io/packages/merge-conflicts so I could figure out the key combo.
Felt like there should have been a UI button on the footer interface.
merge-conflicts v1.4.4.
It'd be cool to have a (discoverable) way to navigate among conflicts within a file or across files.
A related suggestion from @Haacked that's a good idea:
When you click on a conflicted file, scroll the first conflict into the view.
Also on this, I noticed that when clicking on the file, it doesn't take you to the merge conflict for the first one. See gif:
@nadim Well @smashwilson works for GitHub on Atom, so since he opened the issue I think it's fairly official already. :) This is something we'll definitely fix when we can.
Well, for me "prev/next conflict" might be the most important feature in the conflicts handling.
https://github.atom.io/videos/github-feature-resolve-conflict.mp4
By looking at this movie from official website I thought that clicking on conflict takes you to the first conflict in the file (not the beginning of the file). Conveniently, in the movie, beggining of the file was also in the visual center of the conflicted lines :)
Time to get down-voted:
macOS:
⌘ + F, <<<<, enter
Windows/Linux:
CTRL + F, <<<<, enter
Viola!
@heisian that's a simple workaround, but from a UX standpoint, I think this would still be a great feature to add to the native conflict resolution tool in Atom.
The merge conflict resolution tool on github.com has this functionality and it allows you to jump through conflicts and resolve them without having to remember what characters to search for.
It's not super critical, but it's a nice to have!
@smashwilson I see that the Feature Sprint v0.20.0 was closed out, but this was not. Was this never continued?
I'm about to have to install a plugin (EDIT: The plugin doesn't even work, go figure.) for what I find to be confoundlingly unfriendly behavior in an otherwise shockingly user-friendly editor, when I realized it's stupid to NEED a plugin to not have to manually skim (*or know how to search) a twenty thousand line file for the four lines I care about.
I'm new to git, I'm learning because of Atom and a project I'm now involved in -- I just thought the devs might like to hear the perspective of a new user, not trying to step on anyone's toes.
It's annoying not to have a button, but you can use Ctrl+F then search for <<<<<<< or =======
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.
"Implement it as a feature? Why, it's too easy to implement as a feature!" -- the devs, apparently (ca. 2018)
