Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Thanks! #12

Open
LandonSchropp opened this issue Aug 13, 2020 · 1 comment
Open

Thanks! #12

LandonSchropp opened this issue Aug 13, 2020 · 1 comment

Comments

@LandonSchropp
Copy link

Thanks for making this plugin! This is a huge upgrade over what I was doing before.

@ranelpadon
Copy link

ranelpadon commented Mar 14, 2021

Yeah, I really want to say thanks for this awesome plugin, just the one I really needed!!! Coming from Atom/VS Code, these editors implemented it elegantly, but JetBrains refused to implement this inline-conflict resolution workflow in their IDEs. I filed an StackOverflow issue/ticket to JetBrains, but they said they have no plans to implement it:
https://stackoverflow.com/questions/63593048/inline-merge-conflict-resolver-in-pycharm-intellij-jetbrains-ides#answer-63703195

So, quite surprised that there's a similar plugin for Vim! I checked other Vim-conflicts plugins also but they're not really what I wanted. Cheers. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants