We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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 for making this plugin! This is a huge upgrade over what I was doing before.
The text was updated successfully, but these errors were encountered:
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. :)
Sorry, something went wrong.
No branches or pull requests
Thanks for making this plugin! This is a huge upgrade over what I was doing before.
The text was updated successfully, but these errors were encountered: