-
Notifications
You must be signed in to change notification settings - Fork 3k
Format targets.json to put the items of large lists on their own line #8717
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.
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't read the diff, but idea is so correct I'm just approving immediately.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ever had one of those moments where you think "huh. Why didn't I think of that before?"
I wonder how many rebases bringing in this PR will cause. I much prefer this tho. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 minimize conflicts when touching targets code
Is this updating all labels/macros/device_has ? I noticed some labels were still on the same line. Just checking the "rules" we should follow - if we use "one attribute per line" for all of them.
I'm sure I have seen this submitted once before in a PR, but I think the timing was bad - lots of other target changes coming in at the same time. When you do it, you're going to get the mother of all merge conflicts, so just need to find a moment when there won't be too many other things needing rebasing. |
I think I only caught ones that had lines longer than >80. It should be formatted more thoroughly, I'll go back and fix any it missed. |
/morph build |
Build : SUCCESSBuild number : 3607 Triggering tests/morph test |
Exporter Build : SUCCESSBuild number : 3211 |
Test : FAILUREBuild number : 3383 |
Note: This PR is now a part of a rollup PR (#8733). In order to expidite remaining CI testing, this PR has been bundled into the above rollup PR. No further work is needed here, as once that PR is merged, this PR will also be closed and marked as merged. If any more commits are made in this PR, this PR will remain open and have to go through CI on its own. |
This is causing strange merge conflicts with 5.10 so pushing out to 5.11 |
Description
When rebasing a feature branch there are an irritating number of merge conflicts caused by the
device_has
field intargets.json
solely because all features are included on the same line.The PR formats the targets.json file to include each device feature and similar json lists on a new line to stop this happening so much.
Pull request type