Added contributing instructions and authors. #12

Merged
merged 3 commits into from Jan 11, 2015

Conversation

Projects
None yet
2 participants
Member

dimitern commented Jan 9, 2015

Added CONTRIBUTING.md with instructions for collaborators, AUTHORS.md with the list of maintainers, and updated the README.md slightly.

Member

dimitern commented Jan 9, 2015

Please take a look @niemeyer

AUTHORS.md
+goamz Authors
+=============
+
+This file contains the list of the official goamz maintainers.
@niemeyer

niemeyer Jan 9, 2015

Contributor

The official maintainers and the list of authors is not actually the same. It also seems unnecessary to have a list of official maintainers.. the point of contact should be the project itself and the mailing list. The maintainers should be watching those.

I suggest "dumbing down" this file to be a list of authors, people that contributed relevant code to the project.

@dimitern

dimitern Jan 10, 2015

Member

Changed as suggested - list of authors, not official maintainers.

CONTRIBUTING.md
+ * [Fork](https://help.github.com/articles/fork-a-repo/) the go-amz/amz repository.
+ * If you found a bug, please check the existing [issues](https://github.com/go-amz/amz/issues) to see if it's a known problem. Otherwise, [open a new issue](https://github.com/go-amz/amz/issues/new) for it.
+ * Clone your forked repository locally.
+ * Switch to the `v1` branch.
@niemeyer

niemeyer Jan 9, 2015

Contributor

If you clone a non-v1 branch, the branch won't magically be there. That said, when you clone from the amz repository, because v1 is set as the development focus, that's what will be cloned:

$ git clone https://github.com/go-amz/amz
Cloning into 'amz'...
remote: Counting objects: 1552, done.
remote: Compressing objects: 100% (40/40), done.
remote: Total 1552 (delta 14), reused 3 (delta 0)
Receiving objects: 100% (1552/1552), 359.52 KiB | 167.00 KiB/s, done.
Resolving deltas: 100% (1071/1071), done.
Checking connectivity... done.

$ cd amz
$ git branch
* v1
@dimitern

dimitern Jan 10, 2015

Member

Simplified and clarified as suggested.

CONTRIBUTING.md
+ * Be sure to test your code changes.
+ * Push your feature branch to your fork.
+ * Open a pull request with a description of your change.
+ * Ask a maintainer for a code review.
@niemeyer

niemeyer Jan 9, 2015

Contributor

This should not be needed. Maintainers should be watching the project for such pull requests.

@dimitern

dimitern Jan 10, 2015

Member

Updated.

CONTRIBUTING.md
+ * If you found a bug, please check the existing [issues](https://github.com/go-amz/amz/issues) to see if it's a known problem. Otherwise, [open a new issue](https://github.com/go-amz/amz/issues/new) for it.
+ * Clone your forked repository locally.
+ * Switch to the `v1` branch.
+ * Create a feature branch for your contribution.
@niemeyer

niemeyer Jan 9, 2015

Contributor

Would be good to recommend keeping the branch as small as possible, and saying it's okay to send multiple requests often, to prevent people trying to merge 10k lines in one go and being surprised with a reject.

CONTRIBUTING.md
+ * Reply to comments, fix issues, push your changes. Depending on the size of the patch, this process can be repeated a few times.
+ * Once you get an approval and the CI tests pass, ask a maintainer to merge your patch.
+
+Becoming an official maintainer
@niemeyer

niemeyer Jan 9, 2015

Contributor

I'd drop this section entirely. In most serious projects official maintainers merely become, transparently, because they are involved enough and it makes sense. An "official maintainer" badge pretty much never works, unless the project is changing hands.

@dimitern

dimitern Jan 10, 2015

Member

I think at least for the sake of mentioning signing the CLA this should stay. Rephrased a bit though.

CONTRIBUTING.md
+not clear.
+
+ * Commit early, commit often.
+ * Before pushing your changes for the first time, use `git rebase -i v1` to minimize merge conflicts. Do not use `git pull v1`, use `git fetch` instead to avoid merging.
@niemeyer

niemeyer Jan 9, 2015

Contributor

This requires a very intimate relation with git and revision control. I'd strongly suggest not asking people to do that in such a "newcomers" guideline. People that understand what rebase is and how it works internally don't need this guideline at all.

@dimitern

dimitern Jan 10, 2015

Member

Simplified.

CONTRIBUTING.md
+
+ * Commit early, commit often.
+ * Before pushing your changes for the first time, use `git rebase -i v1` to minimize merge conflicts. Do not use `git pull v1`, use `git fetch` instead to avoid merging.
+ * Rebase and squash small, yet unpushed changes. Let's keep the commit log cleaner.
@niemeyer

niemeyer Jan 9, 2015

Contributor

Same.

@dimitern

dimitern Jan 10, 2015

Member

Removed.

CONTRIBUTING.md
+ * Commit early, commit often.
+ * Before pushing your changes for the first time, use `git rebase -i v1` to minimize merge conflicts. Do not use `git pull v1`, use `git fetch` instead to avoid merging.
+ * Rebase and squash small, yet unpushed changes. Let's keep the commit log cleaner.
+ * Do not rebase commits you already pushed, even when in your own fork. Others might depend on them.
@niemeyer

niemeyer Jan 9, 2015

Contributor

That's worth keeping, though.

README.md
+------------
+
+Contributors are most welcome!
+Please have a look at [CONTRIBUTING.md](CONTRIBUTING.md) for instructions.
@niemeyer

niemeyer Jan 9, 2015

Contributor

s/instructions/details/

README.md
+License
+-------
+
+goamz is licensed under [LGPLv3](LICENSE).
@niemeyer

niemeyer Jan 9, 2015

Contributor

Suggest:

goamz is licensed under LGPLv3, but includes an exception that allows linking code statically.
See the [LICENSE](LICENSE) for details.
Contributor

niemeyer commented Jan 9, 2015

LGTM given the above notes.

Member

dimitern commented Jan 10, 2015

@niemeyer Thanks for the review! I've done all relevant suggestions and I think it's ready for merging.

dimitern pushed a commit that referenced this pull request Jan 11, 2015

Merge pull request #12 from dimitern/v1-contrib
Added contributing instructions, ways to get in touch, and list of authors.

@dimitern dimitern merged commit ad23e96 into go-amz:v1 Jan 11, 2015

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@dimitern dimitern deleted the dimitern:v1-contrib branch Jan 11, 2015

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