docs(en): merging all conflicts

Author: docschina-bot

CHANGELOG.md

@@ -1,5 +1,23 @@
 # rollup changelog
 
+## 4.44.0
+
+_2025-06-19_
+
+### Features
+
+- Remove limit on `maxParallelFileOps` as this could break watch mode with the commonjs plugin (#5986)
+
+### Bug Fixes
+
+- Provide better source mappings when coarse intermediate maps are used (#5985)
+
+### Pull Requests
+
+- [#5984](https://github.com/rollup/rollup/pull/5984): fix(deps): lock file maintenance minor/patch updates (@renovate[bot], @lukastaegert)
+- [#5985](https://github.com/rollup/rollup/pull/5985): Improve approximation of coarse sourcemap segments (@TrickyPi)
+- [#5986](https://github.com/rollup/rollup/pull/5986): Remove limit on max parallel file ops (@lukastaegert)
+
 ## 4.43.0
 
 _2025-06-11_

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.43.0",
+  "version": "4.44.0",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

docs/configuration-options/index.md

@@ -633,13 +633,23 @@ buildWithCache()
 
 ### maxParallelFileOps {#maxparallelfileops}
 
+<<<<<<< HEAD
 |        |                                 |
 | -----: | :------------------------------ |
 | 类型： | `number`                        |
 |  CLI： | `--maxParallelFileOps <number>` |
 | 默认： | 20                              |
 
 该选项限制 rollup 在读取模块或写入 chunk 时，同时能打开的文件数量。如果没有限制或者数值足够高，构建可能会失败，显示“EMFILE: Too many open files”（EMFILE：打开的文件数过多）。这取决于操作系统限制的句柄数（open file handles）大小。
+=======
+|          |                                 |
+| -------: | :------------------------------ |
+|    Type: | `number`                        |
+|     CLI: | `--maxParallelFileOps <number>` |
+| Default: | `Infinity`                      |
+
+Limits the number of files rollup will open in parallel when reading modules or writing chunks. Without a limit or with a high enough value, builds can fail with an "EMFILE: too many open files". This depends on how many open file handles the operating system allows. If you set the limit too low and use plugins that rely on the [`this.load`](../plugin-development/index.md#this-load) context function, such as the `commonjs` plugin, then it can happen that builds stall without an error message as it limits the number of parallel `load` calls.
+>>>>>>> 37d1915060e08b84326bee0713444eec7162de88
 
 ### onLog {#onlog}