Skip to content

Conversation

@mongodb-drivers-pr-bot
Copy link
Contributor

Merge new changes from release/2.3 into master.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge master -m "Resolve conflicts in master" 

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:
git reset --hard master git merge --strategy=ours release/2.3 -m "Ignore changes from release/2.3" 

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

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

Labels

None yet

3 participants