doc: change STYLE-GUIDE to STYLE_GUIDE

[Dean-Coakley]

Changed filename of STYLE-GUIDE to STYLE_GUIDE to be consistent with naming conventions.
Changed all references to this file.

Fixes: #11456

[joyeecheung]

The commit(ca5215e) that added this file actually says:

doc: add STYLE_GUIDE (moved from nodejs/docs)

So probably it's the file name that should be corrected? @gibfahn

[Dean-Coakley]

@joyeecheung I think you are right. Pretty much every other file uses that naming convention. I am happy to close this.

Might wait for confirmation first.

Please excuse the side note: If anyone has any suggestions/ideas for my first contribution to Node elsewhere let me know! :) Documentation/Javascript only pretty much. Very minimal knowledge of C++.

[lpinca]

@Dean-Coakley don't close, this PR could be updated to fix the file name instead of the link.

[gibfahn]

@Dean-Coakley yeah, I'd change the PR to update the file name (and fix any links that were pointing to the old file name).

cc/ @nodejs/docs

[gibfahn]

Please could you format your commit message according to the Contributing Guidelines?

Maybe something like this (if you include the Fixes: link the issue will automatically be closed when this PR lands):

doc: change STYLE-GUIDE to STYLE_GUIDE

Fixes: https://github.com/nodejs/node/issues/11456

If you don't have time it can be rewritten by whoever lands this, but if you are going to help out more on the project (as I hope you do), then it saves work if you produce better commit messages.

This seems like a good place to start with contributing, if you're looking for other stuff to do there is the good first contribution label.

[Dean-Coakley]

@gibfahn My apologise for these mistakes.

I think I have fixed everything but it appears to be two commits. Er...is this ok? Or must I rebase or something?

Thanks.

[lpinca]

@Dean-Coakley commits can be squashed when landing by whoever lands this. If you want to help further you can squash the commits and add the Fixes: metadata in the commit message as @gibfahn suggested.

Thanks!

[claudiorodriguez]

@Dean-Coakley I'll merge this tomorrow if no one objects - I'll rebase the commits and add metadata if you want, but if you want to do it yourself, you basically need to git rebase -i HEAD~2 on your local branch for this PR, mark the first commit as drop (we don't need to change the link), and the second as reword. You should get a prompt to edit the second commit's message, where you can then add the metadata (fixes, pr-url, reviewed-by). Then you save and after the rebase is done, you should only see the second commit with git log, and the link should be unaltered, and the file should be renamed. Then you push to your remote branch with --force and that should update the PR.

[gibfahn]

mark the first commit as drop (we don't need to change the link),

I don't think that will just work, the second commit reverts the change in the first one, so you'll probably get a merge conflict.

[claudiorodriguez]

Oh, didn't notice that. Just squash then

[Dean-Coakley]

So I squash both commits? Haven't done this before.

[claudiorodriguez]

Mark the second commit as squash - since you always squash into a previous commit. Then you'll get a prompt to edit the commit message (with both commit messages pasted together - make sure only what you want remains)

[gibfahn]

@Dean-Coakley you should have something like this:

Rebasing and removing unneeded commits

Then when you save and quit, you'll get the commit message editor:

Delete the first commit message lines so it looks like:

Then save and quit. You should see some output like:

git status (which I have aliased to g s) should show that you're 2 commits behind, 1 commit ahead of your master branch. If you then do git push --force-with-lease it will overwrite/update your remote branch.

[Dean-Coakley]

You are currently editing a commit while rebasing

No changes
You asked to amend the most recent commit, but doing so would make
it empty. You can repeat your command with --allow-empty, or you can
remove the commit entirely with "git reset HEAD^".

I should do git reset?

[gibfahn]

@Dean-Coakley are you on Twitter? It's difficult to have a conversation with someone on Github (I'm @gibfahn, feel free to ping me there).

EDIT: or IRC?

[gibfahn]

@Dean-Coakley Looks like something went wrong (you've now got 4 commits in this PR). Here's what I'd suggest you do (this assumes you followed CONTRIBUTING.md and now have two remotes, origin and upstream.

git reset --hard upstream/master # Clean everything and start again
mv doc/STYLE-GUIDE.md doc/STYLE_GUIDE.md # Make the change again
git add -A # Add all files to the index
git commit
# Paste in the commit message, I've put it in below
git status # Should say 5 commits behind, 1 commit ahead
git push --force-with-lease

Try that

doc: change STYLE-GUIDE to STYLE_GUIDE

Fixes: https://github.com/nodejs/node/issues/11456

[Dean-Coakley]

Should be all good now.

Thanks everyone for your help! 😄

[gibfahn]

Will land later today if there are no objections.

[mhdawson]

LGTM

[gibfahn]

Landed in 5f08871

Thanks for your contribution @Dean-Coakley!

[jasnell]

This should only land in v6 or v4 if the original style guide PR lands

[gibfahn]

(Depends on #11321)