Skip to content

Commit b6989d7

Browse files
committed
Fixed the issue mentioned in pull request.
1 parent 9e66c00 commit b6989d7

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
---
2-
id: branching_naming_convention
3-
title: Branching Naming Convention
4-
sidebar_label: Branching Naming Convention
2+
id: branch_naming_convention
3+
title: Branch Naming Convention
4+
sidebar_label: Branch Naming Convention
55
---
66

77
#### The following convention should be followed:
88

9-
* Branch name should exactly match with the corresponding jIRA ticket that you will be working on. `<project-name>-<ticket-number>`
9+
* Branch name should exactly match with the corresponding JIRA ticket that you will be working on. `<project-name>-<ticket-number>`
1010

11+
Examples:
1112

12-
eg:
1313
* FHF-100
14-
* DEL-200
14+
* DEL-200
15+
16+
* If there's no JIRA or project management tool in use, the branch naming strategy should be feature specific.
17+
18+
Examples:
19+
* upgrade-php
20+
* add-button-tooltip

docs/git/branching_strategy.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ title: Branching Strategy
44
sidebar_label: Branching Strategy
55
---
66

7-
#### Main branches:
7+
#### Main Branches:
88

99
* master (Production)
1010
* dev (Development)
1111
* qa (QA)
1212
* uat (UAT)
1313
* staging (Staging)
1414

15-
#### Supporting branches:
15+
#### Supporting Branches:
1616

1717
* Feature branches
1818
* Release branches
1919
* Hotfix branches
2020

2121
#### The following convention should be followed:
22+
2223
* Every branch should be a branch of `dev` and should be merged to `dev` after PR is reviewed
2324
* Every feature, task is done in a separate branch <b>named according to the JIRA issue name</b>.
2425
* Any critical bug after production release is done via hotfix branches. It is branched off from `master` and <b>merged back to master and dev after it’s done</b>.

docs/git/code_review_checklist.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
id: code_reviewe_checklist
2+
id: code_review_checklist
33
title: Code Review Checklist
44
sidebar_label: Code Review Checklist
55
---
66

7-
Smart commits allows a team to perform actions on Jira issues from a single commit. Users can enter the issue key and the desired action such as time tracking or closing an issue.
7+
Smart commits allows a team to perform actions on JIRA issues from a single commit. Users can enter the issue key and the desired action such as time tracking or closing an issue.
88

99
#### List:
1010

@@ -18,7 +18,6 @@ Smart commits allows a team to perform actions on Jira issues from a single comm
1818
* Repetitive code has been factored out
1919
* Frameworks have been used appropriately – methods have all been defined appropriately
2020
* Command classes have been designed to undertake one task only
21-
* JSPs do not contain business logic
2221
* Unit tests are present and correct
2322
* Common errors have been checked for
2423
* Potential threading issues have been eliminated where possible
@@ -29,7 +28,6 @@ Smart commits allows a team to perform actions on Jira issues from a single comm
2928
* The code does not use unjustifiable static methods/blocks
3029
* The code complies to coding standards
3130
* Logging used appropriately (proper logging level and details)
32-
* NPEs and AIOBs
3331
* The code does not reinvent the wheel
3432
* The code does not have any side effect on existing functionality
3533

docs/git/pull_request_best_pratices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ sidebar_label: Pull Request Best Practices
55
---
66

77
#### Best Practices:
8+
89
* Pull Request should atleast be <b>reviewed by 1 person</b> before merging it to the base branch.
910
* Only comment author can resolve comment – if code was corrected or after discussion author decides to fix it.
1011
* Don’t mention the same problem many times. Don’t bloat the code, say it once and ask to fix everywhere.
1112
* If there are pending, not resolved comments, the assignee is a code author who should fix or comment back.
1213
* If there are discussions commented by the code author, the assignee is reviewer, who should continue a discussion or resolve comments and approve.
1314
* Use labels to mark what actions should be next – e.g. `needs review`, `Reviewed By... ` etc.
14-
* Provide details/screenshots about what has been changed
15-
* In cases of frontend, use screenshots if applicable.
15+
* Provide details/screenshots about what has been changed.

docs/git/smart_commit.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Smart commits allows a team to perform actions on Jira issues from a single comm
1212
* `#time` : Records time tracking information against a Jira issue.
1313
* `#<transition-name>` : Moves the Jira issue to a particular workflow state.
1414

15-
eg:
16-
* `git commit -m "TEST-34 #time 1w 2d 4h 30m Total work logged"`.
17-
* `TEST-101 #time 4h 30m Fix null pointers #comment Fixed code #resolve`
15+
#### Examples:
16+
17+
- git commit -m "FHF-34 #time 1w 2d 4h 30m Total work logged".
18+
- DEL-101 #time 4h 30m Fix null pointers #comment Fixed code #resolve

docs/git/tagging.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,9 @@ Semantic Versioning is all about releases, not builds. This means that the versi
99
Following are the standards that should be followed while tagging releases:
1010

1111
* Every release should have a tag.
12-
1312
* You can tag from any long running branch ( dev, qa, staging, master). However, we strictly follow tagging from master branch.
14-
1513
* Tag name should follow the *major.minor.patch_* naming conventions as suggested by <a href="https://semver.org/" target="_blank">Semantic Versioning</a>
16-
1714
* The tag for a version is in "X.Y.Z" format where,
18-
1915
* Z is hot-fixes and patch release. If the release includes hot-fixes and patches, we increment this value by 1. Example : "2.7.1", "2.7.2"
20-
2116
* Y includes major feature releases. If the release includes a major feature which is going to production for the first time we increase this value by 1. Example: "2.8.0", "2.9.0"
22-
2317
* X is increased when there is a major change in the system which affects the entire application flow or UI/UX(flow) of a system. Example: "3.0.0", "4.0.0" .

sidebars.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
"docs": {
33
"Overview": ["introduction"],
44
"Github": [
5-
"git/branching_naming_convention",
5+
"git/branch_naming_convention",
66
"git/branching_strategy",
77
"git/smart_commit",
88
{
@@ -13,7 +13,7 @@ module.exports = {
1313
]
1414
},
1515
"git/pull_request_best_pratices",
16-
"git/code_reviewe_checklist"
16+
"git/code_review_checklist"
1717
],
1818
"Naming Convention": ["files", "classes", "functions", "variables", "constants", "folders"]
1919
}

0 commit comments

Comments
 (0)