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

Add --ask-conflict-only #173

Closed
ArneBachmann opened this issue Feb 8, 2018 · 2 comments
Closed

Add --ask-conflict-only #173

ArneBachmann opened this issue Feb 8, 2018 · 2 comments
Assignees
@ArneBachmann
Labels
enhancement question
Milestone
1.6

Comments

@ArneBachmann
Copy link
Owner

By default could ask also for insert and delete, otherwise only on conflict
or the other way around
@ArneBachmann ArneBachmann self-assigned this Feb 8, 2018
@ArneBachmann ArneBachmann modified the milestones: Future, 1.4 Feb 8, 2018
@ArneBachmann ArneBachmann modified the milestones: 1.4, Future Feb 18, 2018
@ArneBachmann ArneBachmann modified the milestones: Future, 1.6 Mar 4, 2018
@ArneBachmann
Copy link
Owner Author

ArneBachmann commented Mar 23, 2018 •
edited

Implemented in update and merge but not in lineMerge

@ArneBachmann
Copy link
Owner Author

Implemented not by making a distinction between ask and ask-only-conflict, but adding an interactive "for-all" choice for the user

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@ArneBachmann ArneBachmann

Labels
enhancement question
Projects
None yet
Milestone
1.6
Development

No branches or pull requests
1 participant
@ArneBachmann