Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Navigation between merge conflicts #812

Open
@smashwilson

Description

@smashwilson

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.

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions