Skip to content

build(deps): bump tailwind_merge from 1.5.3 to 1.5.5 in /docs - #523

Merged
cirdes merged 1 commit into
mainfrom
dependabot/bundler/docs/tailwind_merge-1.5.5
Aug 31, 2026
Merged

build(deps): bump tailwind_merge from 1.5.3 to 1.5.5 in /docs#523
cirdes merged 1 commit into
mainfrom
dependabot/bundler/docs/tailwind_merge-1.5.5

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Aug 30, 2026

Copy link
Copy Markdown
Contributor

Bumps tailwind_merge from 1.5.3 to 1.5.5.

Release notes

Sourced from tailwind_merge's releases.

v1.5.5

1.5.5 (2026-08-24)

Bug Fixes

  • config: merge bare bg-conic with other background image classes (#92)
  • config: make columns-auto conflict with other columns classes (#91)
  • config: support container scale in inline sizing groups (#90)
  • config: add none option to max-h class group (#89)

Miscellaneous Chores

  • add port-upstream skill (#93)

v1.5.4

1.5.4 (2026-08-13)

Bug Fixes

  • config: axis shorthands override logical sides (#87)
Changelog

Sourced from tailwind_merge's changelog.

1.5.5 (2026-08-24)

Bug Fixes

  • config: merge bare bg-conic with other background image classes (#92)
  • config: make columns-auto conflict with other columns classes (#91)
  • config: support container scale in inline sizing groups (#90)
  • config: add none option to max-h class group (#89)

Miscellaneous Chores

  • add port-upstream skill (#93)

1.5.4 (2026-08-13)

Bug Fixes

  • config: axis shorthands override logical sides (#87)
Commits
  • b670d64 Merge pull request #94 from gjtorikian/release-please
  • a549040 [skip test] release v1.5.5
  • a54982f Merge pull request #93 from gjtorikian/chore/port-upstream-skill
  • 3948b43 Merge pull request #92 from gjtorikian/fix/bare-bg-conic
  • 6ae91cc Merge pull request #91 from gjtorikian/fix/columns-auto
  • 092ec59 Merge pull request #90 from gjtorikian/fix/inline-sizing-container-scale
  • 3864c4a Merge pull request #89 from gjtorikian/fix/max-h-none
  • d3a3f50 [auto-lint]: Lint files
  • 840de11 chore: add port-upstream skill
  • 20b2d91 [auto-lint]: Lint files
  • Additional commits viewable in compare view

Dependabot compatibility score

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 rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will 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 version will 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 dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Summary by cubic

Updates tailwind_merge in /docs from 1.5.3 to 1.5.5 to pick up bug fixes for class conflict resolution (e.g., bg-conic, columns-auto, max-h-none).

Written for commit 04e5e0a. Summary will update on new commits.

Review in cubic

Bumps [tailwind_merge](https://github.com/gjtorikian/tailwind_merge) from 1.5.3 to 1.5.5.
- [Release notes](https://github.com/gjtorikian/tailwind_merge/releases)
- [Changelog](https://github.com/gjtorikian/tailwind_merge/blob/main/CHANGELOG.md)
- [Commits](gjtorikian/tailwind_merge@v1.5.3...v1.5.5)

---
updated-dependencies:
- dependency-name: tailwind_merge
  dependency-version: 1.5.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file ruby Pull requests that update ruby code labels Aug 30, 2026
@dependabot
dependabot Bot requested a review from cirdes as a code owner August 30, 2026 10:03
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file ruby Pull requests that update ruby code labels Aug 30, 2026
@cirdes
cirdes merged commit ad18a14 into main Aug 31, 2026
7 checks passed
@cirdes
cirdes deleted the dependabot/bundler/docs/tailwind_merge-1.5.5 branch August 31, 2026 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file ruby Pull requests that update ruby code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant