Both local and remote notebook have been modified #35

gitfoxi · 2017-03-06T17:43:53Z

Now what?

I could minimize the chance of this happening by setting auto-save in emacs, make sure dropbox is always running with a big warning if network can't connect.

On the orgzly side it would make sense to sync both before and after adding a new note.

But still, conflict is inevitable. The only way forward now seems to be to clear the database and start over. I guess I'd prefer some options like diff, merge, rename, remote wins, local wins.

This is happening on my first day of use; The very first time I tried adding a note with orgzly. I guess more experienced users have discovered a practice to avoid the situation. Please share how you do it.

Update

Clear database is not a great idea. You lose all your settings.

Occurs to me that if org files were simply saved on Google Drive as a text file that the system would take care of synchronization. Is that what others are doing?

danShumway · 2017-03-06T17:58:30Z

You can force load or force save a single note with a long tap.

I believe there's also an option to create a duplicate, at which point you could do a local git diff if you wanted. And I'm sure I'm misremembering, but I thought that auto-merge was being discussed at some point? Probably just wishful thinking. In any case, there's no need for you to clear the database, just choose the version you want and sync that.

I do run into this occasionally, but not too often. I'm not a fan of auto-syncing on orgzly's side, I like that I can control data usage - but I can see how having the option would be useful, and would probably clear up a good deal of issues like this for other people.

TLDR, get into the habit of syncing regularly when you open the app, make sure dropbox is always running locally, many of these issues will go away. If something goes wrong, force pull/push and continue from there - if syncs are happening regularly, you should rarely ever lose more than one or two items. Autosync would likely help with that, but I prefer manual syncing and rarely get bitten by it.

nevenz · 2017-03-09T23:31:20Z

I was playing a bit with merging long time ago. It shouldn't be too hard to use a plain diff/patch approach for start, though I'm not sure how often that would work.

Long-term, every change to a note could be encoded and saved and then reproduced, but that would require each note having an ID (like MobileOrg does). I've been passionately avoiding that, though it might be necessary for some other features too (dependencies, internal linking, etc).

Occurs to me that if org files were simply saved on Google Drive as a text file that the system would take care of synchronization. Is that what others are doing?

It's the saving to Google Drive part that can cause a conflict. :)

Problem with conflict in Orgzly is not different from the same issue Dropbox and Google Drive have. If you were to "Pause syncing" in Dropbox for example, you'd soon run into it. :)

So yeah, some of the options:

Implement auto synchronization #8 for minimizing the chance of conflict
Auto-merge (which I'm not a fan of personally, it sounds too scary to me, it would have to be initiated by user explicitly)
Copy file on conflict - which is what other services like Dropbox are doing

ghost · 2017-04-07T20:25:43Z

I actually like the auto-merging feature, especially if it keeps the conflicts marked in the text, like git does on a conflict:

 <<<<<<< HEAD:mergetest
 This is my third line
 =======
 This is a fourth line I am adding
 >>>>>>> 4e2b407f501b68f8588aa645acafffa0224b9b78:mergetest

This is really easy to see and resolve manually, later, without having to compare two individually saved files (like your 3rd bullet). However, it probably requires having a common "baseline" version that your other two versions forked from, so you can see what the conflicts were and diff them independently. And, there's the rub, I guess.

mkaito · 2017-04-30T14:45:26Z

This situation can usually be avoided by being religious about hitting 'sync' before and after anything you do. However, there's one major issue with this: Sending anything to orgzly via 'share' does not sync first. So if I made any changes on the computer, and later find something on the phone that I want to save in orgzly, there's no way to avoid a conflict unless I remember to manually switch to orgzly first and sync.

colonelpanic8 · 2017-09-21T05:34:42Z

The git synchronization I'm working on in #173 should handle most (any cases that git itself would handle) of this properly.

inducer · 2017-11-18T02:56:49Z

Sorry to be dense, but where is this "Force load"/"Force save" option? I can't find it in 1.6 from Fdroid. As a result, I'm not currently sure how to recover from a conflicted notebook.

colonelpanic8 · 2017-11-18T13:58:53Z

@inducer Doesn't exists. Would need a changes to the repo interface as of right now.

nevenz · 2017-11-18T17:21:44Z

Sorry to be dense, but where is this "Force load"/"Force save" option?

In the list of notebooks, long-click one of the notebook to open the menu. You will lose changes on one side of course, as the name implies.

Doesn't exists. Would need a changes to the repo interface as of right now

This is for Git sync, right?

inducer · 2017-11-18T17:35:29Z

In the list of notebooks, long-click one of the notebook to open the menu. You will lose changes on one side of course, as the name implies.

OIC, found it. Thanks! I was trying long-click in the left-side pull-out menu, which didn't do much.

abhaymittal · 2018-03-13T02:00:22Z

OIC, found it. Thanks! I was trying long-click in the left-side pull-out menu, which didn't do much

For some reason, it does not work for me. I am using the android version of the application and nothing happens when I long click on the notebook name in the Notebooks menu. Any ideas on what could be wrong?

inducer · 2018-03-13T02:29:25Z

No, not the menu. Click on "Notebooks" in the menu, which will give you another list of notebooks. Long-pressing on those gives that option.

abhaymittal · 2018-03-14T04:05:20Z

No, not the menu. Click on "Notebooks" in the menu, which will give you another list of notebooks. Long-pressing on those gives that option.

Got it, Thanks a lot!

vclvm · 2018-05-15T17:34:08Z

I believe "force load" and "force save" are a bit confusing - save local to cloud or cloud to local? Same goes with load, probably not confusing for native speakers, but I'm confused. Something more opposite like upload/download would be more obvious.

nevenz · 2018-05-17T07:23:05Z

I believe "force load" and "force save" are a bit confusing - save local to cloud or cloud to local? Same goes with load, probably not confusing for native speakers, but I'm confused. Something more opposite like upload/download would be more obvious.

It's not always the cloud though, it can be a local directory. So even upload/download don't seem right I think.

Perhaps localization is an option?

vclvm · 2018-05-17T12:38:11Z

It's not always the cloud though, it can be a local directory. So even upload/download don't seem right I think.
Perhaps localization is an option?

There are some reasons for my phone to be in English locale, so localization is not an option in my case.
I see the problem with upload/download, may be something around internal/external will do better? E.g. Save internal and Save external are pretty straightforward.

NQNStudios · 2019-04-20T02:57:26Z

Just started using Orgzly and ran into this issue.

nevenz · 2019-04-27T07:05:17Z

Just started using Orgzly and ran into this issue.

Have you managed to resolve the conflict?

NQNStudios · 2019-04-27T17:06:54Z

Yes! The solution was a bit complicated but I figured it out.

…

On Sat, Apr 27, 2019, 1:05 AM Neven ***@***.***> wrote: Just started using Orgzly and ran into this issue. Have you managed to resolve the conflict? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#35 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AATXBKKZDVQNZ7BO6PPKT5LPSP3LBANCNFSM4DCR34CA> .

mkrauss · 2019-06-19T03:50:10Z

For Emacs users, a reasonably decent fix when this happens is this:

Open the notebook file in Emacs first.
Force save it from Orgzly.
Once Dropbox syncs, either of two things will happen, depending on your Emacs config:
3a. If Emacs automatically reloads the file: you should be able to immediately hit undo in Emacs, returning the buffer to the state before the sync, and leaving it in an unsaved state, then proceed to step 4.
3b. If Emacs does not automatically reload the file: I haven't tried it, but it should be fine to just proceed to step 4 without intervention; although it won't show that the file is unsaved, I'd guess it should work.
Run M-x ediff-current-file which gives you an ediff session comparing the buffer to the saved file. You can now use ediff and/or manual editing to resolve the differences and keep whatever you like, then resave the file, and sync in Orgzly again to load your fixed version.

That may sound complicated but it's really quite easy, and if you haven't used ediff, it's great - just hit ? to toggle a quick cheatsheet. Give it a try!

Asalle · 2019-11-11T20:21:03Z

Is it possible to add something like "view merge confilits diff"? I often fix merge conflicts by hand and for that I will have to skim through an entire file. Even the worst diff would be so much more helpful! Thank you for the amazing app btw!

nevenz · 2019-11-12T10:42:07Z

Is it possible to add something like "view merge confilits diff"? I often fix merge conflicts by hand and for that I will have to skim through an entire file.

Sounds good, can you open a new issue? Thanks!

Asalle · 2019-11-12T10:46:17Z

Sure! #633

…

On Tue, Nov 12, 2019, 11:42 AM Neven ***@***.***> wrote: Is it possible to add something like "view merge confilits diff"? I often fix merge conflicts by hand and for that I will have to skim through an entire file. Sounds good, can you open a new issue? Thanks! — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#35?email_source=notifications&email_token=ABF6TYUEEPYMUGGBW6ZYINTQTKCAJA5CNFSM4DCR34CKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDZ2HNY#issuecomment-552838071>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABF6TYS7CNVRP3XR7EVC2YDQTKCAJANCNFSM4DCR34CA> .

Diomas · 2020-06-01T02:32:06Z

I've fall into the same issue, and I want my orgzly changes override ones that are in the directory (I'm using Syncthing).
Now the question is which of this buttons keeps changes made in orgzly and discards changes in the directory:

I'm afraid to tap any of them, since the meaning of these icons is not obvious for me :)

Asalle · 2020-06-01T06:52:31Z

Don't worry, the app will ask you with a modal dialog like "Do you want to overwrite local?" when you tap any of the buttons. But the second (arrow up) is the one that overwrites the remote notebook.

…

On Mon, Jun 1, 2020, 4:32 AM Dmitry Skopa ***@***.***> wrote: I've fall into the same issue, and I want my orgzly changes override ones that are in the directory (I'm using Syncthing). Now the question is which of this buttons keeps changes made in orgzly and discards changes in the directory: [image: image] <https://user-images.githubusercontent.com/856038/83370695-cd37e300-a3c8-11ea-997e-1dcfa3afe0cc.png> I'm afraid to tap any of them, since the meaning of these icons is not obvious for me :) — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#35 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABF6TYWWLFJBOIIY7VRJHUTRUMHLFANCNFSM4DCR34CA> .

oatberry · 2020-06-06T16:20:44Z

I'm afraid to tap any of them, since the meaning of these icons is not obvious for me :)

There's a thing you can do, I think in almost all (if not every) android app, where if you press and hold an icon button, it'll show a tooltip with the name of the button :)

nevenz added the Type: question label Mar 9, 2017

Asalle mentioned this issue Nov 12, 2019

Sync diff #633

Open

1 task

nevenz closed this as completed Jul 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Both local and remote notebook have been modified #35

Both local and remote notebook have been modified #35

gitfoxi commented Mar 6, 2017 •

edited

Loading

danShumway commented Mar 6, 2017 •

edited

Loading

nevenz commented Mar 9, 2017

ghost commented Apr 7, 2017 •

edited by ghost

Loading

mkaito commented Apr 30, 2017

colonelpanic8 commented Sep 21, 2017

inducer commented Nov 18, 2017

colonelpanic8 commented Nov 18, 2017

nevenz commented Nov 18, 2017

inducer commented Nov 18, 2017

abhaymittal commented Mar 13, 2018

inducer commented Mar 13, 2018

abhaymittal commented Mar 14, 2018

vclvm commented May 15, 2018

nevenz commented May 17, 2018

vclvm commented May 17, 2018 •

edited

Loading

NQNStudios commented Apr 20, 2019

nevenz commented Apr 27, 2019

NQNStudios commented Apr 27, 2019 via email

mkrauss commented Jun 19, 2019 •

edited

Loading

Asalle commented Nov 11, 2019

nevenz commented Nov 12, 2019

Asalle commented Nov 12, 2019 via email •

edited

Loading

Diomas commented Jun 1, 2020

Asalle commented Jun 1, 2020 via email

oatberry commented Jun 6, 2020 •

edited

Loading

Both local and remote notebook have been modified #35

Both local and remote notebook have been modified #35

Comments

gitfoxi commented Mar 6, 2017 • edited Loading

Update

danShumway commented Mar 6, 2017 • edited Loading

nevenz commented Mar 9, 2017

ghost commented Apr 7, 2017 • edited by ghost Loading

mkaito commented Apr 30, 2017

colonelpanic8 commented Sep 21, 2017

inducer commented Nov 18, 2017

colonelpanic8 commented Nov 18, 2017

nevenz commented Nov 18, 2017

inducer commented Nov 18, 2017

abhaymittal commented Mar 13, 2018

inducer commented Mar 13, 2018

abhaymittal commented Mar 14, 2018

vclvm commented May 15, 2018

nevenz commented May 17, 2018

vclvm commented May 17, 2018 • edited Loading

NQNStudios commented Apr 20, 2019

nevenz commented Apr 27, 2019

NQNStudios commented Apr 27, 2019 via email

mkrauss commented Jun 19, 2019 • edited Loading

Asalle commented Nov 11, 2019

nevenz commented Nov 12, 2019

Asalle commented Nov 12, 2019 via email • edited Loading

Diomas commented Jun 1, 2020

Asalle commented Jun 1, 2020 via email

oatberry commented Jun 6, 2020 • edited Loading

gitfoxi commented Mar 6, 2017 •

edited

Loading

danShumway commented Mar 6, 2017 •

edited

Loading

ghost commented Apr 7, 2017 •

edited by ghost

Loading

vclvm commented May 17, 2018 •

edited

Loading

mkrauss commented Jun 19, 2019 •

edited

Loading

Asalle commented Nov 12, 2019 via email •

edited

Loading

oatberry commented Jun 6, 2020 •

edited

Loading