Releases: VeyronSakai/conflict-resolver
Releases · VeyronSakai/conflict-resolver
Release list
v0.5.2
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#133)
- perf: batch git commands to reduce process spawns @VeyronSakai (#132)
- chore(deps-dev): bump picomatch from 2.3.1 to 2.3.2 @dependabot[bot] (#119)
- chore(deps-dev): bump handlebars from 4.7.8 to 4.7.9 @dependabot[bot] (#120)
- chore(deps-dev): bump fast-xml-parser from 5.4.2 to 5.5.8 @dependabot[bot] (#118)
- chore(deps-dev): bump flatted from 3.3.3 to 3.4.2 @dependabot[bot] (#117)
- chore(deps-dev): bump minimatch from 10.2.3 to 10.2.4 @dependabot[bot] (#114)
- chore(deps-dev): bump the npm-development group across 1 directory with 7 updates @dependabot[bot] (#113)
- chore(deps): bump the actions-minor group with 2 updates @dependabot[bot] (#111)
- chore(deps-dev): bump minimatch from 10.1.1 to 10.2.3 @dependabot[bot] (#106)
- chore(deps-dev): bump rollup from 4.56.0 to 4.59.0 @dependabot[bot] (#108)
- chore(deps): bump @rollup/rollup-linux-x64-gnu from 4.56.0 to 4.58.0 @dependabot[bot] (#110)
- chore(deps-dev): bump fast-xml-parser from 5.3.6 to 5.4.2 @dependabot[bot] (#112)
- chore(deps-dev): bump fast-xml-parser from 5.3.4 to 5.3.6 @dependabot[bot] (#105)
- chore(deps-dev): bump @github/local-action from 6.0.2 to 7.0.0 @dependabot[bot] (#103)
- chore(deps): bump release-drafter/release-drafter from 6.1.0 to 6.2.0 in the actions-minor group @dependabot[bot] (#104)
Bug Fixes
- fix: resolve minimatch ReDoS vulnerability (GHSA-7r86-cg39-jmmj) @VeyronSakai (#131)
v0.5.1
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#102)
- Update README with rename conflict details and new input @VeyronSakai (#101)
v0.5.0
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#100)
- feat: add no-renames option and expand supported conflict types @VeyronSakai (#99)
- chore: Update @actions/core to 2.0.1 and @actions/exec to 2.0.0 @copilot-swe-agent[bot] (#98)
- chore(deps): bump actions/upload-artifact from 5 to 6 @dependabot[bot] (#97)
- chore(deps): bump super-linter/super-linter from 8.3.0 to 8.3.2 in the actions-minor group @dependabot[bot] (#95)
- chore(deps-dev): bump the npm-development group with 8 updates @dependabot[bot] (#92)
Features
- Update README for rename/rename conflict support @VeyronSakai (#91)
v0.4.0
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#90)
Features
- Support auto-resolve for rename/rename conflicts @VeyronSakai (#89)
v0.3.2
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#88)
Bug Fixes
- Fix rename vs delete conflict logic @VeyronSakai (#87)
v0.3.1
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#86)
- fix: update js-yaml to 3.14.2 to address prototype pollution vulnerab… @VeyronSakai (#85)
- Update Dependabot cooldown and linter workflow @VeyronSakai (#84)
- chore(deps-dev): bump the npm-development group with 7 updates @dependabot[bot] (#77)
- chore(deps): bump the actions-minor group with 2 updates @dependabot[bot] (#80)
- Disable zizmor linter to fix super-linter 8.3.0 upgrade @copilot-swe-agent[bot] (#83)
- chore: rebuild dist/ after npm dependency updates @copilot-swe-agent[bot] (#82)
- chore(deps-dev): bump @eslint/compat from 1.4.1 to 2.0.0 @dependabot[bot] (#78)
- chore(deps): bump @rollup/rollup-linux-x64-gnu from 4.52.5 to 4.53.3 @dependabot[bot] (#79)
- chore(deps): bump actions/checkout from 5 to 6 @dependabot[bot] (#81)
- chore(deps-dev): bump js-yaml from 4.1.0 to 4.1.1 @dependabot[bot] (#76)
- chore(deps-dev): bump the npm-development group with 5 updates @dependabot[bot] (#74)
- chore(deps-dev): bump @rollup/plugin-commonjs from 28.0.8 to 29.0.0 @dependabot[bot] (#75)
- chore(deps): bump ruby/setup-ruby from 1.265.0 to 1.267.0 in the actions-minor group @dependabot[bot] (#72)
- chore(deps): bump actions/upload-artifact from 4 to 5 @dependabot[bot] (#73)
v0.3.0
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#71)
Features
- Add unsupported conflict type handling for DD, AU, UA @VeyronSakai (#70)
- Revert "Support auto-resolution for rename/rename conflicts" @VeyronSakai (#69)
Bug Fixes
- Revert "Fix UA,AU conflict logic" @VeyronSakai (#68)
- Fix UA,AU conflict logic @VeyronSakai (#67)
v0.2.0
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#65)
Features
- Support auto-resolution for rename/rename conflicts @VeyronSakai (#64)
v0.1.6
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#63)
- Add detection for rename/rename conflicts (not supported for auto-resolution) @VeyronSakai (#62)
- chore(deps-dev): bump the npm-development group across 1 directory with 7 updates @dependabot[bot] (#61)
- Update dependabot.yml @VeyronSakai (#60)
- chore(deps): bump super-linter/super-linter from 8.2.0 to 8.2.1 in the actions-minor group @dependabot[bot] (#56)
- chore(deps): bump actions/setup-node from 5 to 6 @dependabot[bot] (#57)
- chore(deps): bump @rollup/rollup-linux-x64-gnu from 4.52.4 to 4.52.5 in the npm-production group @dependabot[bot] (#58)
- chore(deps): bump ruby/setup-ruby from 1.263.0 to 1.265.0 in the actions-minor group across 1 directory @dependabot[bot] (#55)
- chore(deps-dev): bump the npm-development group with 5 updates @dependabot[bot] (#51)
- chore: remove Claude-related workflow files @VeyronSakai (#54)
- chore(deps): bump github/codeql-action from 3 to 4 @dependabot[bot] (#52)
- chore(deps): bump the actions-minor group with 3 updates @dependabot[bot] (#47)
- chore(deps-dev): bump the npm-development group with 10 updates @dependabot[bot] (#48)
- chore(deps): bump @rollup/rollup-linux-x64-gnu from 4.52.3 to 4.52.4 in the npm-production group @dependabot[bot] (#49)
- chore(deps): bump @rollup/rollup-linux-x64-gnu from 4.50.1 to 4.52.0 @dependabot[bot] (#46)
- chore(deps-dev): bump the npm-development group with 6 updates @dependabot[bot] (#45)
- chore(deps): bump the actions-minor group with 2 updates @dependabot[bot] (#44)
Bug Fixes
- fix: update claude-code-review workflow for v1.0.10 @VeyronSakai (#50)
v0.1.5
Immutable
release. Only release title and notes can be modified.
Changes
- Update files for release @veyronsakai-app[bot] (#43)
- Rename project to 'Git Conflict Resolver Action' @VeyronSakai (#42)