pre-commit: add hook check-merge-conflict#7883
Conversation
Codecov Report
@@ Coverage Diff @@
## main #7883 +/- ##
============================================
+ Coverage 22.09% 29.79% +7.70%
- Complexity 21577 31119 +9542
============================================
Files 4966 5100 +134
Lines 336379 367598 +31219
Branches 48340 56289 +7949
============================================
+ Hits 74328 109542 +35214
+ Misses 251209 243170 -8039
- Partials 10842 14886 +4044
Flags with carried forward coverage won't be shown. Click here to find out more. see 1383 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
|
@blueorangutan package |
|
@jbampton a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6837 |
|
@blueorangutan package |
|
@DaanHoogland a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 7045 |
Check for files that contain merge conflict strings. https://github.com/pre-commit/pre-commit-hooks#check-merge-conflict Another check or test we can have that can run automatically locally with `git commit`.
DaanHoogland
force-pushed
the
pre-commit-merge-conflict
branch
from
a451919 to
7a5ee72
Compare
|
@blueorangutan package |
|
@DaanHoogland a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 7048 |
|
the UI build fails, not sure if this is with this PR alone. |
5 participants
Check for files that contain merge conflict strings.
https://github.com/pre-commit/pre-commit-hooks#check-merge-conflict
Another check or test we can have that can run automatically locally with
git commit.Description
This PR adds another pre-commit hook expanding our framework and coverage.
The new hook
check-merge-conflictis from the official pre-commit repos.We do already have a GitHub Action that checks for merge conflicts but this new hook is better
since it runs both locally and on CI with pre-commit.
If the check or test can run locally then there is faster feedback to the developer before opening a pr.
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
Just run the new hook:
pre-commit run check-merge-conflict --all-filesRun all hooks:
pre-commit run --all-files