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

No TakeRight*MergeConflictResolver types #13

Closed
lassevk opened this issue May 1, 2017 · 0 comments
Closed

No TakeRight*MergeConflictResolver types #13

lassevk opened this issue May 1, 2017 · 0 comments
Assignees
@lassevk
Milestone
May 2017 bugfix r...

Comments

@lassevk
Copy link
Owner

lassevk commented May 1, 2017

For the two left-centric merge conflict resolvers:

  • TakeLeftThenRightMergeConflictResolver
  • TakeLeftThenRightIfRightDiffersFromLeft

should have counterparts that point the other way.
lassevk added a commit that referenced this issue May 1, 2017
@lassevk
Fixes issue #13; Added right-centric versions of TakeLeftThenRight*Me…
bcb8c81 
…rgeConflictResolver types
@lassevk lassevk modified the milestone: April 2017 release May 1, 2017
@lassevk lassevk self-assigned this May 1, 2017
@lassevk lassevk added this to the May 2017 bugfix release milestone May 1, 2017
@lassevk lassevk closed this as completed May 21, 2017
lassevk added a commit that referenced this issue Aug 15, 2017
@lassevk
Fixes issue #13; Added right-centric versions of TakeLeftThenRight*Me…
47d0e8b 
…rgeConflictResolver types
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@lassevk lassevk

Labels
None yet
Projects
None yet
Milestone
May 2017 bugfix release
Development

No branches or pull requests
1 participant
@lassevk