Skip to content

Resolve merge conflicts to sync 2.4.9-develop with main#441

Open
dshevtsov wants to merge 183 commits intoAdobeDocs:2.4.9-developfrom
commerce-docs:sync-develop
Open

Resolve merge conflicts to sync 2.4.9-develop with main#441
dshevtsov wants to merge 183 commits intoAdobeDocs:2.4.9-developfrom
commerce-docs:sync-develop

Conversation

@dshevtsov
Copy link
Copy Markdown
Contributor

Purpose of this pull request

This pull request (PR) resolves merge conflicts to sync 2.4.9-develop with main.

Summary of what was merged

Conflicts were between HEAD (2.4.9 / devsite) and main (content updates). Resolution keeps devsite conventions (InlineAlert, relative links, ** emphasis) and prefers main where it is more accurate (dynamic db / amqp / stomp resolution, STOMP from 2.4.5, correct filename queue_consumer.xml instead of queue_customer.xml).

Files

  1. async-configuration.md

    • Publisher paragraph from main (dynamic connections from env.php).
    • Info alert: main wording + correct filenames + STOMP 2.4.5.
  2. bulk-operations-example.md

    • Removed duplicate “Create queue_publisher.xml” heading.
    • Kept explicit <connection name="amqp" exchange="magento" />.
    • Single STOMP publisher example + InlineAlert.
    • Closing note with link to configuration.md and 2.4.5 STOMP.
  3. configuration.md

    • main’s full Connection resolution, Handler processing, Consumer spawning, env.php, and ActiveMQ sections.
    • Normalized tables and **For RabbitMQ / STOMP:** labels.
  4. index.md

    • main’s MQF overview table + InlineAlert.
    • Switch-to-broker intro from main.
    • Both the product_action_attribute.update RabbitMQ note and an Example: switch a topic to ActiveMQ Artemis (STOMP) block with the inventory.update config from HEAD.
  5. migration.md

    • main’s 2.4.4 → 2.4.5+ narrative, shorter tables, Legacy migrations wrapper, em-dash bullets, and 2.4.5+ example labels (dropped “2.4.9 introduced STOMP / backport” wording).

Status

  • All conflict markers removed; the five files were staged as part of concluding the merge.

yogesh-valiya and others added 30 commits May 11, 2024 13:34
Bumps the npm_and_yarn group with 1 update: [multer](https://github.com/expressjs/multer).


Updates `multer` from 1.4.5-lts.1 to 1.4.5-lts.2
- [Release notes](https://github.com/expressjs/multer/releases)
- [Changelog](https://github.com/expressjs/multer/blob/v1.4.5-lts.2/CHANGELOG.md)
- [Commits](expressjs/multer@v1.4.5-lts.1...v1.4.5-lts.2)

---
updated-dependencies:
- dependency-name: multer
  dependency-version: 1.4.5-lts.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-5f5a3b5ddd

Bump multer from 1.4.5-lts.1 to 1.4.5-lts.2 in the npm_and_yarn group
Bumps [@adobe/gatsby-theme-aio](https://github.com/adobe/aio-theme) from 4.15.0 to 4.15.1.
- [Release notes](https://github.com/adobe/aio-theme/releases)
- [Commits](https://github.com/adobe/aio-theme/compare/@adobe/gatsby-theme-aio@4.15.0...@adobe/gatsby-theme-aio@4.15.1)

---
updated-dependencies:
- dependency-name: "@adobe/gatsby-theme-aio"
  dependency-version: 4.15.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…rn/adobe/gatsby-theme-aio-4.15.1

Bump @adobe/gatsby-theme-aio from 4.15.0 to 4.15.1
Update version on the Module Reference intro
Bumps the npm_and_yarn group with 1 update: [tar-fs](https://github.com/mafintosh/tar-fs).


Updates `tar-fs` from 2.1.2 to 2.1.3
- [Commits](https://github.com/mafintosh/tar-fs/commits)

---
updated-dependencies:
- dependency-name: tar-fs
  dependency-version: 2.1.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-762d904987

Bump tar-fs from 2.1.2 to 2.1.3 in the npm_and_yarn group
Bumps the npm_and_yarn group with 1 update: [brace-expansion](https://github.com/juliangruber/brace-expansion).


Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@1.1.11...v1.1.12)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-6ea9762674

Bump brace-expansion from 1.1.11 to 1.1.12 in the npm_and_yarn group
Bumps the npm_and_yarn group with 1 update: [pbkdf2](https://github.com/crypto-browserify/pbkdf2).


Updates `pbkdf2` from 3.1.2 to 3.1.3
- [Changelog](https://github.com/browserify/pbkdf2/blob/master/CHANGELOG.md)
- [Commits](browserify/pbkdf2@v3.1.2...v3.1.3)

---
updated-dependencies:
- dependency-name: pbkdf2
  dependency-version: 3.1.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-eca7abf8ab

Bump pbkdf2 from 3.1.2 to 3.1.3 in the npm_and_yarn group
…-mode

Customer grid indexer mode (2.4.8)
---
updated-dependencies:
- dependency-name: "@adobe/gatsby-theme-aio"
  dependency-version: 4.15.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dshevtsov dshevtsov requested a review from meker12 April 3, 2026 23:00
@dshevtsov dshevtsov self-assigned this Apr 3, 2026
@dshevtsov dshevtsov added the maintenance Repository upkeep label Apr 3, 2026
@github-project-automation github-project-automation bot moved this to 📋 Needs Review in Commerce - Pull Requests Apr 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

maintenance Repository upkeep

Projects

Status: 📋 Needs Review

Development

Successfully merging this pull request may close these issues.