New update
- clone a project from a repository to local workspace;
- create a new branch for an update;
- complete the update;
- perform a Code Review;
- merge your branch with
master
; - delete your branch.
Notes
- always delete development branches;
- always push squashed commit to
master
.
- clone a project from a repository to local workspace;
- create a new branch for an update;
- complete the update;
- perform a Code Review;
- create a Pull Request to the original repository.
IDEA
- checkout
master
branch; - select
VCS
in menu; - select
Git
; - select
Merge changes
; - check
Squash commit
; - click on
Merge
.
In projects using next types of branches:
master
- master branch. Contains a production version of the project. Don't push working changes tomaster
!feature/version
- branch for a feature. Use for updates or fixes which are in developing. Can be named as project version.
Recommended commit head message length: 50
symbols.
Template
[DATE] ([VERSION] or [TYPE]): [HEAD OF MESSAGE]
1. Added:
- first addition;
- ...
2. Closed:
- first issue;
- ...
3. Fixed:
- first fix;
- ...
4. Updated:
- first update;
- ...
5. Deleted:
- first deletion;
- ...
6. Refactored:
- first refactor position;
- ...
Example
2019-05-12 v. 2.1.3: fixed bugs in History screen
1. Added:
- AdaptiveRecyclerView library support.
2. Fixed:
- items naming in History;
- portion loading in History.
3. Updated:
- Google libraries (to 17.0.0+).
4. Deleted:
- unused strings.
Commit body sections order
Added
- what was added in the commit;Closed
- what issues closed in the commit;Fixed
- what was fixed in the commit;Updated
- what was updated in the commit;Deleted
- what was deleted in the commit;Refactored
- what was refactored in the commit.