Not sure how to proceed here

[kmeirlaen]

After applying a sync operation (#2169), a conflict has occured. But i dont know how to resolve it...

2026-09-17.19-01-55.mp4

[MrNeRF]

The clearer conflict choices are already on master through #2248: the review shows Local and Gallery values, with separate “Apply locally” and “Apply and update Gallery” actions. Tests confirm that choosing the local-only action or Cancel does not publish.

#2211 is receiving a separate improvement to explain what changed before you open the project. The deleted-online-copy publishing problem is tracked in #2208.