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
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
I think i had trouble with the git plugin on android and ended up not using it. I used Termux instead and just used a couple of homescreen shortcuts to scripts to pull and push. Theres 100% a simpler way, but that's what workes for me.
Can it merge files in conflict?
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 .