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.

Sign up for GitHub

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

Jump to bottom

Feature request: pick only one conflict #2

Open
maximbaz opened this issue Nov 21, 2018 · 2 comments
Open

Feature request: pick only one conflict #2

maximbaz opened this issue Nov 21, 2018 · 2 comments

Comments

@maximbaz
Copy link
Contributor

When I tried it for the first time, I instinctively assumed that kakmerge-next-conflict and kakmerge-pick work in tandem — you jump to a conflict, select which version you prefer and jump on the next one. Currently kakmerge-pick replaces all conflicts with the selected version, until I read README I thought I'm experiencing a bug.

Can we have kakmerge-pick resolve one conflict and kakmerge-pick-all resolve all conflicts?
@lenormf
Copy link
Owner

lenormf commented Nov 22, 2018

Probably. I thought about it but didn't really need the feature at the time of writing the script, maybe I'll get around to implementing that.

@basbebe
Copy link

basbebe commented Jan 26, 2021

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@maximbaz @lenormf @basbebe