Ahh okay, I think you are too far ahead of us! We haven't implemented merge conflict support yet.

Here is what I would try to do:

1) Download an export of your project first (as a backup in case this goes wrong 😂 ) (This is available under "Project Details -> Explort Project")

2) Make sure you are on Claude Sonnet 4 model (a worse model will not do this well)

3) Prompt in the chat: "pull from origin, and resolve the merge conflict, then push this branch back up to origin"

I don't know if this would work, but it might!

Hmm it looks like you are one commit behind on that branch, can you try pulling first to merge in that commit and then try to push again?

hey hey! welcome to nostr!