stuft2/MERGE_CONFLICT_AGENT_PROMPT.md

Created March 18, 2026 21:50

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/stuft2/b988e45243bf7c2162d642470689dec1.js"></script>
Save stuft2/b988e45243bf7c2162d642470689dec1 to your computer and use it in GitHub Desktop.

Merge Conflict Agent Prompt

Raw

The following files have unresolved merge conflicts. Please open each file, find the conflict markers (<<<<<<< / ======= / >>>>>>>), and resolve every conflict by editing the files directly.

Choose resolutions that best preserve the intent of both changes, or combine them if appropriate.

Files with conflicts:

stuft2/MERGE_CONFLICT_AGENT_PROMPT.md

Select an option

No results found

Select an option

No results found