search

confluentinc / common-docker

Confluent Commons with support for building and testing Docker images.
Apache License 2.0
4 stars 69 forks source link

Merge Conflict Resolution (from 7.3.x to 7.4.x) #477

Closed ConfluentSemaphore closed 6 months ago

ConfluentSemaphore commented 6 months ago

What is this pull request?

This is an autogenerated pull request by pint due to a merge conflict failure seen during pint merge.

Next Steps

  1. Resolve all conflicts (either via web editor or the command line)
  2. Commit merge
  3. Obtain approvals from reviewers
  4. (IMPORTANT) After obtaining approvals, click the dropdown menu on the merge button and select "Create a merge commit"
  5. Click the "Merge pull request" button
  6. Re-run pint merge

NOTE: "Create a merge commit" option must be used to ensure all commits from the head branch is added to the base branch.

Questions?

Please reach out to the Developer Productivity team on Slack at #devprod-eng or #devprod-oncall