Skip to content
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

Add dependents for hainan-medical-university-journal-publishing #2582

Merged
merged 17 commits into from Mar 25, 2017

Conversation

POBrien333
Copy link
Contributor

@POBrien333 POBrien333 commented Mar 23, 2017

See journals here: http://www.hnmujp.org/guide.html

As discussed here: https://forums.zotero.org/discussion/64839/asian-pacific-journal-of-tropical-disease-style-is-not-correct

I didn't add the Chinese version of JoHMU. Don't think that's alive.

Hope I did this right.
Do I always have to delete my own fork before making a new PR? Otherwise the fork is not up to date? I am asking, as all my files were 6 yrs old as that is when I had forked the first time. Thx

Also, why does it pull request for the "Create" and "Update" ones? Is that the way it's supposed to be?

@csl-bot
Copy link

csl-bot commented Mar 23, 2017

Awesome! You've created a pull request to the Citation Styles Language styles repository. We'll get in touch soon (usually within a day or two). In the meantime, our automated test system will go ahead and run some checks on your pull request. In a few minutes you'll be notified of the test results.

If you haven't done so yet, please make sure your style validates and follows all our other Style Requirements.

To update the current pull request, visit the "Files changed" tab above, and click on the pencil icon (see below) in the top-right corner of your style to start editing.

image

If you need assistance at any point, please leave a comment and we'll get back to you (feel free to write in Dutch, English, French, German, Portuguese, or Spanish).

@csl-bot
Copy link

csl-bot commented Mar 23, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot
Copy link

csl-bot commented Mar 23, 2017

😟 There are some issues with your submission. Please check the test report for details.

@rmzelle
Copy link
Member

rmzelle commented Mar 24, 2017

Hope I did this right.
Do I always have to delete my own fork before making a new PR? Otherwise the fork is not up to date? I am asking, as all my files were 6 yrs old as that is when I had forked the first time. Thx

Well, it's usually not necessary to delete your fork (it's a good thing that you didn't have a lot of pull requests open, since I think deleting your fork makes it impossible to (easily) update any existing pull requests you created, since you've lost all your old patch branches).

It looks like GitHub nowadays makes it possible to quickly create a pull request with multiple files in the first commit: https://github.com/blog/2105-upload-files-to-your-repositories. Alternatively, you can create a pull request like you normally do, by adding a single style to our repository, and then add the other files in separate followup commits.

You can also use git on your computer to update your master branch (GitHub for Windows/Mac makes that rather easy nowadays, I think), and then create a fresh branch off that updated master branch, and then create a pull request from that branch to our regular "master" branch. Generally it's better to avoid using the "master" branch in your fork directly for pull requests (like you did here), since that will make your "master" branch diverge from ours, which makes it harder to update later.

Also, why does it pull request for the "Create" and "Update" ones? Is that the way it's supposed to be?

You get "Create" in the standard commit message if you add a file, and "Update" if you modify an existing file.

@rmzelle
Copy link
Member

rmzelle commented Mar 24, 2017

(and this PR is failing because 3 out of 5 dependents are not in the "dependent" subdirectory)

@csl-bot
Copy link

csl-bot commented Mar 24, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot
Copy link

csl-bot commented Mar 24, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot
Copy link

csl-bot commented Mar 24, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot
Copy link

csl-bot commented Mar 24, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot
Copy link

csl-bot commented Mar 24, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot
Copy link

csl-bot commented Mar 24, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot
Copy link

csl-bot commented Mar 24, 2017

😃 Your submission passed all our automated tests.

@POBrien333
Copy link
Contributor Author

It looks like GitHub nowadays makes it possible to quickly create a pull request with multiple files in the first commit: https://github.com/blog/2105-upload-files-to-your-repositories. Alternatively, you can create a pull request like you normally do, by adding a single style to our repository, and then add the other files in separate followup commits.

thanks for clarifying. That seems slightly cumbersome, as I don't like to create files first and then upload them. I usually write/edit the stuff in the browser.
I don't see where I can add a followup commit to another file after starting a Pull Request. that sounds like what I'd like. Can you point me in the right direction? thanks.

@rmzelle
Copy link
Member

rmzelle commented Mar 24, 2017

That seems slightly cumbersome, as I don't like to create files first and then upload them. I usually write/edit the stuff in the browser.

Yeah, it looks like GitHub's "Create new file" is limited to one file. You could ask them (https://github.com/contact) to make it possible to create multiple files that way, but most people probably just switch to a local git client at that point.

I don't see where I can add a followup commit to another file after starting a Pull Request.

Well, for files already affected in the pull request, you can use the pencil icon at the top of the relevant file at https://github.com/citation-style-language/styles/pull/2582/files. To modify as-of-yet untouched files via the GitHub web interface, you need to navigate to the branch the pull request originates from (in this case, the "master" branch in your fork, since the top of this pull request says "damnation333 wants to merge 17 commits into citation-style-language:master from damnation333:master"), so that would be https://github.com/damnation333/styles/tree/master. Then make any additional changes there, and they will show up in the open pull request.

@rmzelle
Copy link
Member

rmzelle commented Mar 24, 2017

(I also forgot to mention that we could have generated these dependents via the "journals" repository; that might have been faster)

@rmzelle rmzelle merged commit 2a82ac3 into citation-style-language:master Mar 25, 2017
@rmzelle
Copy link
Member

rmzelle commented Mar 25, 2017

Thanks!

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.

None yet

3 participants