3 ms·
I do this, but 90% of the time I forget to pull on the other machine and have to deal with conflicts.
by cheez 8y ago
I do this, but 90% of the time I forget to pull on the other machine and have to deal with conflicts.
- acranox 8y agoCheck out Sparkleshare.
- cheez 8y agoOoh this looks good!
- zipperhead 8y agoYes, you'd have to automate the pull for this to work, and then you'd have a way to notify on conflicts so that they are resolved ASAP. Come to think of it, Dropbox isn't really so great at the notification aspect of this either. It creates a 'conflicted' file but there is no notification that I'm aware of. I have to remind myself to periodically check for conflicts.
- geofft 8y agoIs there a standard-ish git merge driver that resolves all merges with a Dropbox-style "conflicted copy", so you can unconditionally git pull in a cronjob and it never leaves the repo in an unmerged state?
- Walkman 8y agoYes, I also found that git is too much hassle for notes.