Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Merge 4.9 into 5.0 #3377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mongodb-php-bot wants to merge 1 commit into 5.0 from merge-4.9-into-5.0-1746473717908
Closed

Conversation

Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented May 5, 2025
edited by norareidy
Loading

Merge new changes from 4.9 into 5.0.

Commits

  • DOCSP-49784: View file typo (DOCSP-49784: View file typo #3376 ): 0dc4a99
  • Resolving conflicts

    To resolve any conflicts, check out the temporary branch and run the following command:
    git merge 5.0
    

    Ignoring changes

    To ignore from the remote branch, first reset the temporary branch to 5.0 and manually merge using the `ours` merge strategy:
    git reset --hard 5.0
    git merge --strategy=ours 4.9
    

    Then, push the temporary branch to upate the pull request.

@norareidy norareidy force-pushed the merge-4.9-into-5.0-1746473717908 branch from 0dc4a99 to 3bacfd8 Compare May 5, 2025 19:47
Copy link
Contributor

I will manually apply the change to 5.4 instead (5.0 doesn't need to be updated)

auto-merge was automatically disabled May 5, 2025 19:58

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@norareidy norareidy norareidy approved these changes

@GromNaN GromNaN Awaiting requested review from GromNaN GromNaN was automatically assigned from mongodb/dbx-php

Assignees
No one assigned
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /