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

[Feature] Smart merge #513

Open
mudejar opened this issue Jun 21, 2024 · 0 comments
Open

[Feature] Smart merge #513

mudejar opened this issue Jun 21, 2024 · 0 comments

Comments

@mudejar
Copy link

mudejar commented Jun 21, 2024

First off, thank you for this useful plugin.

VScode has a pretty neat feature that allows a same line conflict to be resolved very quickly and efficiently.

From here: https://code.visualstudio.com/docs/sourcecontrol/overview#_resolving-conflicts

For some conflicts, the merge editor shows an Accept Combination button. Accepting the combination resolves the current conflict by smartly merging both changes. This is especially useful for changes in the same line that don't touch the same characters.

Would it be feasible to add something like this to this diffview plugin?

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

1 participant