feat(whitespace): minimize whitespace-only changes to JSON file#23
Open
timshadel wants to merge 1 commit intojonatanpedersen:masterfrom
Open
feat(whitespace): minimize whitespace-only changes to JSON file#23timshadel wants to merge 1 commit intojonatanpedersen:masterfrom
timshadel wants to merge 1 commit intojonatanpedersen:masterfrom
Conversation
If there is no difference between the logical structure of the JSON, then try to minimize file thrashing by picking a consistent winner. - If ours and theirs are identical, use that (should be no conflict) - Otherwise, use base (minimize whitespace-only changes to JSON file)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
If there is no difference between the logical structure of the JSON, then try to minimize file thrashing by picking a consistent winner.