this post was submitted on 26 May 2024
9 points (76.5% liked)

ObsidianMD

228 readers
17 users here now

Lovers of Obsidian, rejoice! This community is for discussing all matters related to Obsidian. Please join the conversation and seek to help one another out.

founded 2 years ago
MODERATORS
 

Is anyone using the Obsidian Git plugin or another git solution to sync with Android? If so, How did you get it to work?

you are viewing a single comment's thread
view the rest of the comments
[โ€“] [email protected] 1 points 7 months ago* (last edited 7 months ago) (1 children)

Can it merge files in conflict?

[โ€“] iflyspaceships 2 points 7 months ago (1 children)

Probably. Its the same full git you would have in any other linux distro. The only time I had a conflict, I just stashed the changes because they were minor. From then, Ive just had to be vigilante about remembering which device has the latest vault. Im not awesome at git, unfortunately .