Replying to Avatar MK Fain

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!
e0
e04db363... 3mo ago

The code isn't on the github repo yet, properly because it is not create on my native repo? because there's currently nothing on that particular repo

Reply to this note

Please Login to reply.

Discussion

Avatar
MK Fain 3mo ago

If you are okay with overriding whatever is on your upstream origin repo (probably just a README?) then you can tell the chat: "force push my local changes to remote origin"

That could work 🤞