Skip to content

Merge Conflict Resolution (from 10.9.x to master)#1610

Open
semaphore-agent-reader[bot] wants to merge 1 commit intomasterfrom
pr_merge_from_10_9_x_to_master
Open

Merge Conflict Resolution (from 10.9.x to master)#1610
semaphore-agent-reader[bot] wants to merge 1 commit intomasterfrom
pr_merge_from_10_9_x_to_master

Conversation

@semaphore-agent-reader
Copy link

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

…entries (#1609)

* CC-38740: Validate column mapping regexes against table.include.list entries

* Added null checks for includeList and mappingRegexes lists
@semaphore-agent-reader semaphore-agent-reader bot requested a review from a team as a code owner February 11, 2026 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant