Improve conflict checking #75
Merged
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
…ject checks with scriptConflictNames before outputting its name. If its name is listed it will add the prefix. However, when *making* the conflicts list it should *not* check otherwise the results are skewed. When generating a new folder of reports in data/conflicts has text files with the conflicts per range. New name lists to follow.
…ny places. Need to look at this problem separately.
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.
This fixes a problem with the conflict analysis, when the names are generated while finding conflicts, we must ignore the list of previous problems. The results are a lot cleaner. Plus fixes for issues #68 #70 #71 #72 #73. Note that issue #69 needs some further investigation.