Skip to content

Fix merge conflict when updating link on index page #713

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jul 12, 2023
Merged

Fix merge conflict when updating link on index page #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8299295
reset branch (#695)
caitlindavey May 23, 2023
e747538
Merge branch 'v3.6' of github.com:mongodb/docs-node into v3.6
May 23, 2023
04f30f4
Merge branch 'v3.6' of github.com:mongodb/docs-node into v3.6
caitlindavey Jul 12, 2023
d017a9e
resolving merge conflict
caitlindavey Jul 11, 2023
c03f3f0
resolving error in build log due to missing link
caitlindavey Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions snooty.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ mongosh = "``mongosh``"
driver = "node"
driver-long = "MongoDB Node.js driver"
driver-short = "Node.js driver"
mdb-server = "MongoDB Server"
2 changes: 1 addition & 1 deletion source/fundamentals/crud/read-operations/text.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fields. The following command creates a text index on two fields in the
document.

To learn more about specifying field weights when creating a text
index, see the :ref:`Text Indexes <node-fundamentals-text-indexes>`
index, see the :manual:`Text Indexes </index-text/#specify-weights>`
section in the Indexes guide.

You can only create *one* text index per collection. Every text search
Expand Down
6 changes: 3 additions & 3 deletions source/index.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Take the free online course taught by MongoDB instructors
* - .. figure:: /includes/figures/M220JS_hero.jpg
:alt: Banner for the MongoDB University Node.js Course

- `Using MongoDB with Node.js <https://learn.mongodb.com/learning-paths/using-mongodb-with-nodejs-y13d>`_
Learn the essentials of Node.js application development with
MongoDB.
- `Using MongoDB with Node.js <https://learn.mongodb.com/learning-paths/using-mongodb-with-nodejs>`_

Learn the essentials of Node.js application development with MongoDB.