Merging remote/local conflicts

[tdaron]

Hello !

Just started using this tool, it works amazingly well x)

However, when trying to sync with my phone, I noticed that the app is not able to merge conflicts between local and remote, even when the difference is just a new task on both side.

Wouldn't it be possible to just keep those 2 new tasks instead of sending one to the trash (without even knowing which one is deleted as the app only shows there is a conflict but doesn't tell where or what)

I could try to make a PR for this, but I wanted to make sure it would be feasible as well as accepted into the codebase.

Thanks again for your work !

[github-actions]

Thank you very much for opening up this issue! I am currently a bit overwhelmed by the many requests that arrive each week, so please forgive me, if I fail to respond personally. I am still very likely to at least skim read your request and I'll probably try to fix all (real) bugs if possible and I will likely review every single PR being made (please, give me a heads up if you intent to do so) and I will try to work on popular requests (please upvote via thumbs up on the original issue) whenever possible, but trying to respond to every single issue over the last years has been kind of draining and I need to adjust my approach for this project to remain fun for me and to make any progress with actually coding new stuff. Thanks for your understanding!

[github-actions]

Hello there tdaron! 👋

Thank you and congratulations 🎉 for opening your very first issue in this project! 💖

In case you want to claim this issue, please comment down below! We will try to get back to you as soon as we can. 👀

For more open ended discussions and/or specific questions, please visit the discussions page. 💖

[tdaron]

yup, planned to (try) working on this

[johannesjo]

From my experience this is a complicated subject. But I am open for any suggestions! :)

[Adamantt777]

I find out a workaround to avoid that error by using a secondary Dropbox account for the android synced with web app, and a separated main account on the desktop. Simply import the main account to the web app.

[tdaron]

Yes but does it mean having the phone not synced with the desktop app ?

[Adamantt777]

Yes but does it mean having the phone not synced with the desktop app ?

Yes, but you can add tasks on the phone without problems or missing it on errors. I use more the desktop, so I just copy the new few tasks added on android to the main, then I import all to the web app and since is synced it all appears on the android. It's an extra step to have the same tasks on both accounts, but it's better than to experience the remote/local error IMO.

You decide when to do the manual sync or how often.

[tdaron]

Ok I might try this workflow, handmade sync is better than random sync :)

I will close this issue as I do not think there is a simple implementable solution.

Thanks for your answers :)