chore(deps): bump VeyronSakai/conflict-resolver from 0.5.1 to 0.5.2 - #9737
Closed
dependabot[bot] wants to merge 1 commit into
Closed
chore(deps): bump VeyronSakai/conflict-resolver from 0.5.1 to 0.5.2#9737dependabot[bot] wants to merge 1 commit into
dependabot[bot] wants to merge 1 commit into
Conversation
Bumps [VeyronSakai/conflict-resolver](https://github.com/veyronsakai/conflict-resolver) from 0.5.1 to 0.5.2. - [Release notes](https://github.com/veyronsakai/conflict-resolver/releases) - [Commits](VeyronSakai/conflict-resolver@7d65053...ab9e5cf) --- updated-dependencies: - dependency-name: VeyronSakai/conflict-resolver dependency-version: 0.5.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
Bot
added
dependencies
github_actions
Contributor
👋 Welcome to HRM!Thanks for your contribution. This repository uses Gemini AI for automated triage, code review, and generation. 🤖 Gemini Manual Trigger Quick Reference
For more details and GitHub CLI examples, see the Manual Trigger Guide. |
Contributor
Author
|
OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting If you change your mind, just re-open this PR and I'll resolve any conflicts on it. |
dependabot
Bot
deleted the
dependabot/github_actions/VeyronSakai/conflict-resolver-0.5.2
branch
June 13, 2026 07:06
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bumps VeyronSakai/conflict-resolver from 0.5.1 to 0.5.2.
Release notes
Sourced from VeyronSakai/conflict-resolver's releases.
Commits
ab9e5cfMerge pull request #133 from VeyronSakai/github-actions/update-files/52483d355cUpdate package.jsond18fce8Merge pull request #132 from VeyronSakai/perf/batch-git-commands7ff1859revert: remove -z flag from git status commanda863dfffix: isolate per-file failures in batch conflict resolution3e9a8c0fix: use -z flag in git status to avoid path quoting issues24c6a86fix: add error handling for batch conflict resolution32487afperf: batch git commands to reduce process spawns in conflict resolution1351185Merge pull request #131 from VeyronSakai/fix/minimatch-redos-vulnerability41b9a77fix: resolve minimatch ReDoS vulnerability (GHSA-7r86-cg39-jmmj)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)