Skip to content

Add _multiconfig.yml to .gitignore#35

Merged
yoshinorin merged 1 commit intohexojs:masterfrom
vinzid:master
Feb 9, 2022
Merged

Add _multiconfig.yml to .gitignore#35
yoshinorin merged 1 commit intohexojs:masterfrom
vinzid:master

Conversation

@vinzid
Copy link
Copy Markdown
Contributor

@vinzid vinzid commented May 31, 2020

If more than one configuration files is set, they will be combined to _multiconfig.yml.
Because this file will been generated automatically, I think it's better to add to .gitignore to avoid conflict.

@SukkaW
Copy link
Copy Markdown
Member

SukkaW commented May 31, 2020

Since Hexo will never read _multiconfig.yml directly (It will be overriden every time hexo g is executed), there should be no conflict.

@vinzid
Copy link
Copy Markdown
Contributor Author

vinzid commented Jun 1, 2020

@SukkaW Thanks for your comment.

Yes, there will be not problem to serve or build, but it will confuse users when there's an untracked file which is not added by themself.

If this file is added to the source code with git add, others or the server will still generate this file. Although the content will be the same, if the operation systems or file systems are not all identical (ie: windows vs linux, ext4 vs fat32), and with git config filemode set to true which is default, it will become a modified file, which can happen many times between users and the server.

If the above commits were made at the same period, or some people commit this file, while others ignore this file as untracked or modified, git conflict can be produced.

@yoshinorin yoshinorin merged commit 293d156 into hexojs:master Feb 9, 2022
@yoshinorin
Copy link
Copy Markdown
Member

@vinzid
Sorry so slow reply & thank you for your contribution :)

@vinzid
Copy link
Copy Markdown
Contributor Author

vinzid commented Feb 9, 2022

@yoshinorin That's all right, it's my pleasure. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants