-
Notifications
You must be signed in to change notification settings - Fork 20
Development Guidelines
Raitis Berzins edited this page Jul 2, 2019
·
23 revisions
Hslayers-ng should follow the AngularJS style guide:
https://github.com/toddmotto/angularjs-styleguide
Git workflow (detailed explanation)
- two main branches - master and develop - and feature branches
- master for stable releases only
- develop for testing and combining new features
- create branches for new features named either after the feature purpose (e.g. geolocation, vector-tiles) or preferably the issue number (e.g. issue-121) or e.g. hotfix branch.
Example of the workflow:
- create a new issue on GitHub to reflect the purpose of the new branch
- create a new branch based on
develop
:
git checkout develop
git checkout -b feature_branch
- develop new features and commit the changes (see commit guidelines on how to write a good commit message):
git commit -am "Add new supercool feature"
- if other changes happened on
develop
branch meanwhile, you need to rebase:
git fetch --all
git rebase develop
Do not skip the rebase. It is important to do a rebase first instead of merging to keep the commit history clean.
- resolve any conflicts during the rebase and then push the changes:
git push -u origin feature_branch
- merge
feature_branch
intodevelop
- either by directly merging:
git checkout develop
git merge feature_branch
- or by creating a pull request for your branch if you want to have your work approved by others
Commit messages (more information on Chris Beams blog and tbaggery blog)
Seven rules of a good commit message:
- Separate subject from body with a blank line
- Limit the subject line to 50 characters
- Capitalize the subject line
- Do not end the subject line with a period
- Use the imperative mood in the subject line
- Wrap the body at 72 characters
- Use the body to explain what and why vs. how
For example:
Summarize changes in around 50 characters or less
More detailed explanatory text, if necessary. Wrap it to about 72
characters or so. In some contexts, the first line is treated as the
subject of the commit and the rest of the text as the body. The
blank line separating the summary from the body is critical (unless
you omit the body entirely); various tools like `log`, `shortlog`
and `rebase` can get confused if you run the two together.
Explain the problem that this commit is solving. Focus on why you
are making this change as opposed to how (the code explains that).
Are there side effects or other unintuitive consequences of this
change? Here's the place to explain them.
Further paragraphs come after blank lines.
- Bullet points are okay, too
- Typically a hyphen or asterisk is used for the bullet, preceded
by a single space, with blank lines in between, but conventions
vary here
If you use an issue tracker, put references to them at the bottom,
like this:
Resolves: #123
See also: #456, #789
The easy way of doing it is to use release-it which is also included in devDependencies. Just run:
release-it
Quick Links: Home ➖ App configuration ➖ Layer configuration ➖ Cesium configuration ➖ Composition schema (separate repo)