mongo-go-driver
mongo-go-driver copied to clipboard
Merge release/2.3 into master
Merge new changes from release/2.3 into master.
Commits
- Merge branch 'release/1.17' into release/2.3: dc5af73b
- BUMP v1.17.5: f1d540b2
- GODRIVER-3654 Don't test v1 branches against latest server. (#2188): b8790284
- Allow ignore-for-release label to satisfy label checker (#2203): 21f47d42
- Disable merge-up from release/1.17 (#2202): 8708ca8b
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.