Webstorm / IntellIJ generated commit message "Merge remote-tracking branch 'origin/master'" fails #315
Closed
1 of 4 tasks
Labels
Comments
|
Let's fix this by adding a new wildcard entry here: https://github.com/marionebl/commitlint/blob/master/%40commitlint/is-ignored/src/index.js#L18 PR welcome! |
|
I have the same issue on BitBucket with a different pattern: |
lwouis
pushed a commit
to lwouis/commitlint
that referenced
this issue
Jun 12, 2018
marionebl
pushed a commit
that referenced
this issue
Aug 20, 2018
* feat(utils): ignore IntelliJ project files * feat(is-ignored): add new wildcard patterns (#315)
matheus1lva
referenced
this issue
in matheus1lva/mmp
Aug 29, 2018
## Version **7.1.0** of **@commitlint/config-conventional** was just published.
<table>
<tr>
<th align=left>
Dependency
</th>
<td>
<a target=_blank href=https://github.com/marionebl/commitlint>@commitlint/config-conventional</a>
</td>
</tr>
<tr>
<th align=left>
Current Version
</th>
<td>
7.0.1
</td>
</tr>
<tr>
<th align=left>
Type
</th>
<td>
devDependency
</td>
</tr>
</table>
The version **7.1.0** is **not covered** by your **current version range**.
If you don’t accept this pull request, your project will work just like it did before. However, you might be missing out on a bunch of new features, fixes and/or performance improvements from the dependency update.
It might be worth looking into these changes and trying to get this project onto the latest version of @commitlint/config-conventional.
If you have a solid test suite and good coverage, a passing build is a strong indicator that you can take advantage of these changes directly by merging the proposed change into your project. If the build fails or you don’t have such unconditional trust in your tests, this branch is a great starting point for you to work on the update.
---
<details>
<summary>Release Notes</summary>
<strong>v7.1.0</strong>
<h2>Features</h2>
<ul>
<li>wildcards: add new wildcard patterns <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="313790415" data-permission-text="Issue title is private" data-url="https://github.com/marionebl/commitlint/issues/315" href="https://urls.greenkeeper.io/marionebl/commitlint/issues/315">#315</a> (<a class="commit-link" href="https://urls.greenkeeper.io/marionebl/commitlint/commit/e9ea17fc40f5ccf4b6ca80a990b984fbb466dc47"><tt>e9ea17f</tt></a>)</li>
<li>add max line length to body/footer (<a class="commit-link" href="https://urls.greenkeeper.io/marionebl/commitlint/commit/542f50ec2fd7bc66a3ec84d1b959549484016e9c"><tt>542f50e</tt></a>)</li>
</ul>
<h2>Bug fixes</h2>
<ul>
<li>support lerva v3 <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="347908163" data-permission-text="Issue title is private" data-url="https://github.com/marionebl/commitlint/issues/406" href="https://urls.greenkeeper.io/marionebl/commitlint/pull/406">#406</a> (<a class="commit-link" href="https://urls.greenkeeper.io/marionebl/commitlint/commit/58bb47fc90aee2494839eafe3ed8107d078f48bc"><tt>58bb47f</tt></a>)</li>
</ul>
</details>
<details>
<summary>FAQ and help</summary>
There is a collection of [frequently asked questions](https://greenkeeper.io/faq.html). If those don’t help, you can always [ask the humans behind Greenkeeper](https://github.com/greenkeeperio/greenkeeper/issues/new).
</details>
---
Your [Greenkeeper](https://greenkeeper.io) bot 🌴
|
Fixed via marionebl/commitlint@e9ea17f |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
IntellIJ / Webstorm auto generates a commit message when it sees new commits on the remote branch when pushing commits. You have the option to rebase or to merge. When merging, the message "Merge remote-tracking branch 'origin/master'" is generated but it fails the commitlint.
Expected Behavior
It shouldn't fail, but ignore the commit message
Current Behavior
Fails because it's not added to the ignore wildcards
Affected packages
Possible Solution
Extend the regex of is-ignored to include the message above.
commitlint --versiongit --versionnode --versionThe text was updated successfully, but these errors were encountered: