diff --git a/CHANGELOG.md b/CHANGELOG.md index da3f42d..ebf5823 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### 4.3.9 (2022-01-19) + + +### Bug Fixes + +* **#161:** Fixed issue with `options.ignorews` ([#162](https://github.com/wickedest/Mergely/issues/162)) ([650daaf](https://github.com/wickedest/Mergely/commit/650daaff63503f6426f64b12d8b33cfca6ef7185)) + ### 4.3.8 (2021-11-21) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0e0b0d3..27b42b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ npm run test ## Conventional commits -Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0). +Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0), and [standard-version](https://www.npmjs.com/package/standard-version). To create a commit, run: ```bash diff --git a/git-conventional-commits.json b/git-conventional-commits.json index b32c13e..3681443 100644 --- a/git-conventional-commits.json +++ b/git-conventional-commits.json @@ -4,6 +4,8 @@ "build", "chore", "ci", + "feat", + "fix", "docs", "feat", "fix",