Count oldLines and newLines when there are conflicts #188
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
August 12, 2017 22:10
kpdecker
requested changes
Aug 27, 2017
.gitignore
Outdated
| npm-debug.log |
There was a problem hiding this comment.
These files are left out of the library by design to avoid the maintenance concerns they bring. Glad to take a look at a PR with just functional changes.
|
Reverted .gitignore |
|
Can you remove the dist and lib files as well? |
|
Removed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Try to count
oldLinesandnewLineswhen the hunk contains conflicts. If the patches have the same base file thenoldLinesshould be valid. If base files are different thenoldLinesis deleted.newLinesisn't very useful but I'm keeping the logic symmetric.