Merge Conflicts since #68 was fixed.

[despairblue]

Hey, first of, thanks for creating this extension. I don't use a lot of community plugins, but this one turned out to be indispensable. Great work 👏🏾

Adding the timestamp in the data.json file leads to merge conflicts if obsidian is used on multiple machines and obsidian-git is used to synchronize the vault:

Every obsidian instance will updated the timestamp before pulling and thus create a conflict in that file. It's not that this sometimes happens, it happen consistently every time.

I wonder if

• that timestamp could be in a different file that could be added to .gitignore or
• if the timestamp could turned off or
• if the timestamp could only be updated right after a pull

I think all of those would fix this. What do you thing would be the best option?

[RichSteele]

I can confirm I've been seeing this behavior as well. Thank you for finding the probable cause of an issue I haven't had a chance to track down yet.

[Vinzent03]

I totally see your point. Will decide me for a solution today and patch a fix. Haven't thought about that.

[Vinzent03]

Should be fixed now. Let me know if you have further problems.
I am saving the information now in an additional file. Please add it to your .gitignore
Thanks for your detailed description!
Fixed another bug too. 😅

[despairblue]

Is there a way to try this directly from git as the fix is not released yet?

[Vinzent03]

Sorry I just totally forgot that. Will do it now!

[Vinzent03]

New release is out

[despairblue]

Thank you, this fixed it 👏🏾