Skip to content

Docs/maintainers 266#274

Merged
rewop merged 2 commits into
masterfrom
docs/maintainers-266
Jun 16, 2016
Merged

Docs/maintainers 266#274
rewop merged 2 commits into
masterfrom
docs/maintainers-266

Conversation

@tomchentw
Copy link
Copy Markdown
Owner

@tomchentw tomchentw added this to the 5.0.0 milestone Jun 3, 2016
@tomchentw tomchentw mentioned this pull request Jun 3, 2016
8 tasks
@tomchentw
Copy link
Copy Markdown
Owner Author

Contributors: @cristiandley, @rewop, please review this.

After you reviewed, I'll merge this and add you to the contributor team.

Thanks

Comment thread CONTRIBUTING.md
* [CHANGELOG.md][CHANGELOG.md] is generated for the version as well
* `git tag` for the version is tagged to the commit too
* The last step is release the changes to `origin` and `npm`.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issues

We encourage to report issues, the best way to do it is to write a good report. Some of items to set forth are:

  • OS Platform (ie. Winx64/x86 7, MAC OS "El Capitan", Linux (Distro and Release).
  • Node/Npm Version.
  • Issue indeed (If possible the steps to get it).

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. We should have user document this details stuff down.

@cristiandley
Copy link
Copy Markdown
Collaborator

We could add an Issues section like i just commented on your PR.

I've follow some issues here like "not running locally" that only says that... haha. Its a bit repetitive to ask for that always so that way we point "Please Follow Readme Issues section to report"

Im glad you are open to add us @tomchentw !!!

Comment thread CONTRIBUTING.md Outdated

Simple rules:

* Do rebase before merging.
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomchentw Sorry for the silly question. Could you please clarify to me what you mean here? You mean rebase master into the branch?

Does this mean we don't merge master into the branch?

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we don't merge master into branch. We only do rebase the branch onto latest master.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomchentw Sorry if I ask more questions, but I am not familiar with rebasing process to close a PR. My process usually uses git merge through the following three steps:

  1. merge alpha into branch
  2. resolve conflicts
  3. marge branch into master (github merge button. PR here gets closed).

Your flow instead doesn't need step 1 and 2, and instead of merging in step 3, we do a rebase. So we don't use the merge button from github. Am I correct?

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. We don't use GitHub merge button for collaborator created PRs. Instead, we do:

  1. Rebase the branch to latest master so that it can be ff-merged.
  2. Force pushed the branch to let GitHub know the branch is updated.
  3. Merge the branch to master (should be fast-forward merge).
  4. Push master to GitHub (origin). GitHub will automatically close the PR :)

@rewop
Copy link
Copy Markdown
Collaborator

rewop commented Jun 3, 2016

@cristiandley About the issues section, I came across react-bootstrap-datepicker contributing guidelines just today.

I kind of like their simplicity and clarity in explaining it. Any other ideas?

@tomchentw
Copy link
Copy Markdown
Owner Author

#266 (comment)
I would like to be a maintainer as well. How can I help? What needs doing?

@WebRuin here.

Others.

I'll review it soon.

@tomchentw
Copy link
Copy Markdown
Owner Author

@rewop do you mean the Issue Not Getting Attention? section? Or the whole CONTRIBUTING.md docs itself?

@rewop
Copy link
Copy Markdown
Collaborator

rewop commented Jun 5, 2016

@tomchentw I mainly mean the first three sections. They set guidelines about how to report bugs, or propose api changes. The statements are very clear and they create proper expectations.

@tomchentw
Copy link
Copy Markdown
Owner Author

@rewop Got it. I really like their format. Would you like to fix it for me? :)

Also, when committing the typo fixes that you just created, you should use --fixup command so that after rebasing, the commit history could be clean.

@rewop
Copy link
Copy Markdown
Collaborator

rewop commented Jun 5, 2016

@tomchentw Yes I can add it.

About the commit, I was considering to squash (didn't know about fixup), but I wanted to wait for your comment :). Still getting used to it.

@rewop rewop force-pushed the docs/maintainers-266 branch from 3534f40 to 824c44f Compare June 5, 2016 16:47
@tomchentw
Copy link
Copy Markdown
Owner Author

@rewop let me know after you've done the changes, thanks :)

@rewop
Copy link
Copy Markdown
Collaborator

rewop commented Jun 6, 2016

@tomchentw sorry if a little delayed on this. I didn't have time left after I fixed the commit. I will push the changes in the next few hours.

@rewop rewop force-pushed the docs/maintainers-266 branch from 824c44f to 35a97eb Compare June 6, 2016 17:50
@rewop
Copy link
Copy Markdown
Collaborator

rewop commented Jun 6, 2016

@tomchentw I made the changes, and also updated a little bit the structure and the language to improve understanding. Let me know if you spot any problem, I can make fixes by tomorrow.

@tomchentw
Copy link
Copy Markdown
Owner Author

@rewop looks good! Thanks. Guess we can land this now?

@cristiandley
Copy link
Copy Markdown
Collaborator

@tomchentw Yep!. Sorry my absence. Now im back. 👍

@rewop
Copy link
Copy Markdown
Collaborator

rewop commented Jun 16, 2016

Sorry my absence too. I have been to a short holiday. Now I am back. I can take care of merging this one today.

@rewop rewop merged commit 35a97eb into master Jun 16, 2016
@rewop rewop deleted the docs/maintainers-266 branch June 16, 2016 08:28
@tomchentw
Copy link
Copy Markdown
Owner Author

Thanks for merging this. Great work @rewop , @cristiandley .

@tomchentw
Copy link
Copy Markdown
Owner Author

@idolize you may want to take a look at the contents of this PR. Feel free to ignore the discussions here.

@tomchentw
Copy link
Copy Markdown
Owner Author

@cristiandley @rewop @idolize should we ask collaborators to review the PR before merging?

@tomchentw
Copy link
Copy Markdown
Owner Author

Released v5.0.0.

This version(5.0.0) will never be tagged latest on npm since there's a major rewrite ongoing for 6.0.0. See more details in #267 (comment)

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.

3 participants