All contributors should adhere to the code conventions used in the Hummingbot repository. The guidelines are outlined below.
- Fork the CoinAlpha/hummingbot repository.
- Create a new branch from the
developmentbranch in your fork.
- Make commits to your branch.
When you have finished with your fix / feature / connector / documentation:
Rebase upstream changes into your branch
- Create a pull request to the
- Include a description of your changes
Ensure to Allow edits by maintainers before submitting the pull request
Your code changes will be reviewed by Hummingbot's development team and tested by the QA team.
- Fix any changes requested by your reviewer, fix issues raised by a tester, and push your fixes as a single new commit.
- Once the pull request has been reviewed and accepted; it will be merged by a member of the Hummingbot development team.
1. Fork the repository¶
Use GitHub's interface to make a fork of the repo, add the Hummingbot repo as an upstream remote, and fetch upstream data:
git remote add upstream https://github.com/CoinAlpha/hummingbot.git git fetch upstream
2. Creating your branch¶
Create your local branch and should follow this naming convention:
- feat/ ...
- fix/ ...
- refactor/ ...
- doc/ ...
Create and switch to a new local branch called
feat/[branch_name] based on
development of the remote
git checkout -b feat/[branch_name] upstream/development
3. Commit changes to a branch¶
Make commits to your branch. Prefix each commit like so:
- (feat) add a new feature
- (fix) fix inconsistent tests
- (refactor) ...
- (cleanup) ...
- (doc) ...
Make changes and commits on your branch, and make sure that you only make relevant changes. If you find yourself making unrelated changes, create a new branch for those changes.
Commit message guidelines:
- Commit messages should be written in the present tense, e.g. "(feat) add unit tests".
- The first line of your commit message should be a summary of what the commit changes. Aim for about 70 characters max. Remember: This is a summary, not a detailed description of everything that changed.
- If you want to explain the commit in more depth, following the first line should be blank and then a more detailed description of the commit. This can be as detailed as you want, so dig into details here and keep the first line short.
4. Rebase upstream changes¶
When you are done making changes, you can begin getting your code merged into the main repository. The first step is to rebase upstream changes into your branch.
git pull --rebase upstream development
This will start the rebase process. You must commit all of your changes before doing this. If there are no conflicts, this should roll all of your changes back on top of the changes from upstream, leading to an excellent, clean, linear commit history.
If there are conflicting changes, git will start yelling at you partway through the rebasing process. Then, git will pause rebasing to allow you to sort out the conflicts. You do this the same way you solve merge conflicts, by checking all of the files git says have been changed in both histories and picking the versions you want. Be aware that these changes will show up in your pull request, so try and incorporate upstream changes as much as possible.
You pick a file by
git add ing it - you do not make commits during a rebase.
5. Create a pull request¶
Make a clear pull request from your fork and branch to the upstream development branch, detailing exactly what changes you made and what feature this should add. The clearer your pull request is, the faster you can get your changes incorporated into this repository.
It is important to check Allow edits by maintainers for the Hummingbot team to update your branch with
development whenever needed.
If the development team requests changes, you should make more commits to your branch to address these, then follow this process again from rebasing onwards.
Once you get back here, make a comment requesting a further review, and someone will look at your code again. If it addresses the requests, it will get merged. Else, repeat the process.
Tests are very, very important. Submit tests if your pull request contains new, testable behavior.
This is to help you organize your process.
- Did I create my branch from
- Did I follow the correct naming convention for my branch?
- Is my branch focused on a single main change?
- Do all of my changes directly relate to this change?
- Did I rebase the upstream
developmentbranch after I finished all my work?
- Did I write a clear pull request message detailing what changes I made?
- Did I get a code review?
- Did I make any requested changes from that code review?
If you followed all of these guidelines and made good changes, you should have no problem getting your changes merged.