lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-04-17 11:28:35 +08:00
Code Issues Projects Releases Wiki Activity

merged master

Browse Source
This commit is contained in:
Jamie Peabody
2023-04-02 15:29:25 +01:00
parent 481390f732 f3e90b7588
commit 6643f48b14
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -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)

2
CONTRIBUTING.md
View File

@@ -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

2
git-conventional-commits.json
View File

@@ -4,6 +4,8 @@
"build",
"chore",
"ci",
"feat",
"fix",
"docs",
"feat",
"fix",