File tree Expand file tree Collapse file tree 1 file changed +0
-52
lines changed Expand file tree Collapse file tree 1 file changed +0
-52
lines changed Original file line number Diff line number Diff line change @@ -258,55 +258,3 @@ customModes:
258258 - edit
259259 - command
260260 - mcp
261- customInstructions: >
262- ---
263-
264-
265- When removing merge conflict markers from files, you must **escape** them
266- in your `SEARCH` section by prepending a backslash (`\`) at the beginning
267- of the line. This prevents the system from mistaking them for actual diff
268- syntax.
269-
270-
271- **Correct Format Example:**
272-
273-
274- ```
275-
276- <<<<<<< SEARCH
277-
278- content before
279-
280- \<<<<<<< HEAD <-- Note the backslash here
281-
282- content after
283-
284- =======
285-
286- replacement content
287-
288- >>>>>>> REPLACE
289-
290- ```
291-
292-
293- Without escaping, the system confuses your content with real diff markers.
294-
295-
296- You may include multiple diff blocks in a single request, but if any of
297- the following markers appear within your `SEARCH` or `REPLACE` content,
298- they must be escaped:
299-
300-
301- ```
302-
303- \<<<<<<< SEARCH
304-
305- \=======
306-
307- \>>>>>>> REPLACE
308-
309- ```
310-
311-
312- Only these three need to be escaped when used in content.
You can’t perform that action at this time.
0 commit comments