search

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Navigation between distant conflicts in a single file? #267

Open CodeMan99 opened 7 years ago

CodeMan99 commented 7 years ago

Quite possible I missed something visually while using this tool. If that is the case, just let me know.

  1. I had two conflicts in the same file. I clicked on the "use ours" button.
  2. The update to the file was made in atom's buffer.
  3. 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.

smashwilson commented 7 years ago

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This issue still applies to the new git and GitHub package for Atom, so I've refiled this one at atom/github#812. Subscribe there for updates :sparkles: