-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
gulp: JSON formatting for partly generated files #1933
Conversation
This reverts commit d4736f0.
This won't solve merge conflicts in the built files, so you're still going to have to resolve conflicts. Might as well leave it as is, imo, because this adds a lot of visual clutter to anyone trying to debug this plugin. |
It will help against conflicts. While it's true that the generated minified files of the plugins are still going to conflict, the unminified version will not. Personally, I don't mind the "visual clutter" because you can have code folding in virtually every editor. |
Do you have to edit the source of the autoloader? Why can't you run gulp and get both built for you? |
Because of the git merge conflict format. I will explain with the example for resolving the conflicts of #1892. Just merging master and running gulp will give the following output:
Please note that
Note that both HEAD and master are identical because of At this point, I have to edit the source of show language and run gulp again. This PR makes the "choose either HEAD or master" unnecessary because git will be able to merge the unminified versions (in most cases). Gulp will then do the rest. |
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.
Fair.
Thanks! |
I got tired of getting merge conflicts from
prism-autoloader.js
andprism-show-language.js
whencomponents.json
changed.The new formatting of generated objects will make git able to merge these files automatically.