Keyboard shortcuts

jk
move through the list
↵
open the selected item
a
ask a question
nucw
tabs: new, unanswered, active, top
⌘↵
post the answer you are writing
/or⌘K
search
t
switch theme
?
this list
AskVibe
AskSign in
Demo, all content is generated
Question

Users saw '<<<<<<< HEAD' on my homepage

Solved · 721 views · asked by sunita_d · edited
cursordeployment

Embarrassing. A customer sent me a screenshot: the about section on my site showed

<<<<<<< HEAD
We help small bakeries...
=======
We help independent bakeries...
>>>>>>> feature/new-copy

The content lives in content/about.md. I had a merge conflict last week and Cursor said it resolved it. The build passed so I never noticed.

What I’ve tried

Fixed that file by hand. Now I'm scared there are more of these.

Comment
Could be more of those. Run a grep before anything else. jonas_k · edited
Happens to the best of us. Thanks for posting, I just found one in my own README. thandeka · edited

2 answers

Marked as helpful by the asker
jonas_k · edited

Find any others:

git grep -nE '^(<<<<<<<|=======|>>>>>>>)( |$)'

Code files would fail the build with those markers, but markdown, JSON strings in CMS content and HTML templates don't, so they slip through.

Stop it from happening again:

  1. Before committing a merge: git diff --check reports leftover conflict markers.
  2. Add that to CI so a PR with markers fails: 
    - run: "! git grep -nE '^(<<<<<<<|>>>>>>>)( |$)'"
  3. When Cursor says "resolved", open the file and look. The editor's merge view shows remaining conflicts, the chat message doesn't.
Comment
Found one more in the FAQ. Fixed, CI check added. sunita_d · edited
git diff --check also catches trailing whitespace, so expect some noise the first time. wes_codes · edited
bea_quinn · edited

In VS Code/Cursor the Source Control panel lists files with unresolved conflicts under 'Merge Changes'. If that section is still there, you're not done.

Comment

Related

npm run dev works fine but npm run build fails with a wall of type errorssolved
Cursor did a force push and my cofounder's commits from yesterday are gonesolved
Prisma on Vercel: 'Prisma has detected that this project was built on Vercel'solved
Build passes but the deployed function says ENOENT for a JSON file I read with fssolved
Vercel cron only runs once a day even though I set it to every 10 minutessolved

Your answer

Sign in to write an answer