chore: fix tab with in the prettier config being different from previously causing hard merges#6656
Merged
CommanderStorm merged 2 commits intolouislam:masterfrom Jan 9, 2026
Merged
Conversation
…ausing hard merges
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts a previous formatting configuration change that caused merge conflicts. The change restores the tabWidth for JSON files from 2 to 4 spaces, aligning with the project's consistent 4-space indentation standard.
Key changes:
- Reverts
tabWidthfrom 2 to 4 for*.jsonfiles in Prettier configuration - Removes redundant
package.jsonspecific override (now covered by the general*.jsonrule)
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
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.
I seem to have done a small, but fairly hard to merge chage in formatting.
This reverses it