resolve conflicts

Author: Hweinstock

.eslintrc.js

@@ -180,6 +180,10 @@ module.exports = {
                         message:
                             'Avoid fs-extra, use shared/fs/fs.ts. Notify the Toolkit team if your required functionality is not available.',
                     },
+                    {
+                        name: 'fs',
+                        message: 'Avoid node:fs and use shared/fs/fs.ts when possible.',
+                    },
                 ],
             },
         ],

docs/marketplace/vscode/infraComposer.webp

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /dev: include telemetry for workspace usage when generating new files"
+}

packages/amazonq/.changes/next-release/Bug Fix-0d324321-bddd-4f93-80c4-80978930f157.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Start language server by default"
+}

packages/amazonq/.changes/next-release/Bug Fix-5576420e-6db2-4045-a99f-afced496da0f.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Feature Dev: Add error messages when the upload URL expires"
+}

packages/amazonq/.changes/next-release/Bug Fix-55ef93ff-1589-41bc-a482-ed09002f1fd9.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q (/dev): view diffs of previous /dev iterations"
+}

packages/amazonq/.changes/next-release/Bug Fix-dd58d9cb-4fb4-4cb3-a9a2-dc5c5462e529.json

@@ -0,0 +1,4 @@
+{
+	"type": "Deprecation",
+	"description": "The next release of this extension will require VS Code 1.83.0 or newer."
+}

packages/amazonq/.changes/next-release/Deprecation-4577def6-0191-48db-bec3-480b226285b8.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Automatically pause and resume @workspace indexing when OS CPU load is high"
+}

packages/amazonq/.changes/next-release/Feature-294f0da4-1fb4-43c9-90f2-e066d7351c3c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Inline completion for more json files, and all yaml files"
+}

packages/amazonq/.changes/next-release/Feature-88ac445a-7a5a-4127-97f7-eaccd41629e6.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Show a one-time warning if new VS Code is required"
+}