From f99ef6a0c85a9cef477fb9357c5e9ac1d9bceb92 Mon Sep 17 00:00:00 2001 From: Vaibhav Balloli Date: Thu, 9 Jul 2020 17:09:42 +0530 Subject: [PATCH] Create 2020-06-10-contributing.md (#4) --- _posts/2020-06-10-contributing.md | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 _posts/2020-06-10-contributing.md diff --git a/_posts/2020-06-10-contributing.md b/_posts/2020-06-10-contributing.md new file mode 100644 index 0000000..dbecaf4 --- /dev/null +++ b/_posts/2020-06-10-contributing.md @@ -0,0 +1,34 @@ +# Contributing Guidelines + +This repository partially uses the 'Git' Workflow.There are separate master/release and dev branches.The features which you work on get merged with dev once they are reviewed.The dev branch is merged with master/release branch whenever significant changes are made. + +We love contributions and would be glad to see your implementations/blogs. That out of the way, an average contribution would involve the following: + +## Steps +1. Fork this repository in your account. +2. Clone it on your local machine. +3. Add a new remote using `git remote add upstream https://github.com/cspdf-bphc/blog.git` (or use SSH). +4. Create a new feature branch with `git checkout -b my-feature`. +5. Make your changes. + - To add a blog post, go to the `\_posts` directory. Blog posts, such as this one, are written in markdown. Make sure you follow the `README.md` before you finish changes. + - To add an implementation of a paper, go to the `\_notebooks` directory, and follow the test post, and follow the `README.md`. +6. Commit your changes (See [Guidelines](#commit-message-guidelines)). +7. Rebase your commits with `upstream/dev`: + - `git checkout dev` + - `git fetch upstream dev` + - `git reset --hard FETCH_HEAD` + - `git checkout my-feature` + - `git rebase dev` +8. Resolve any merge conflicts, and then push the branch with `git push origin my-feature`. +9. Create a Pull Request detailing the changes you made and wait for review/merge. + +It might seem a little complicated at a glance, but the fundamental concept is simple: we want to ensure that your changes are always made on top of the latest changes to the project and thus, we can easily merge your code. If you are facing any troubles, create a PR as you usually would and we would merge it manually. :) + +## Commit Message Guidelines +- Use the present tense ("Add feature" not "Added feature") +- Use imperative mood (e.g., "Fix ...", "Add ..." instead of "Fixes ...", "Adds ...") +- Limit the first line to 72 characters or less +- Keep it short, while concisely explaining what the commit does. +- Message should be clear about what part of the code is affected -- often by prefixing with the name of the subsystem and a colon, like "backend: ..." or "docs: ...". +- First line should NOT end with a period. +- Reference the relevant Issue or Pull Request in a new line at the end of the message.