[fhaldridge7]

I have my git repos in one folder ~/git and then use syncthing to sync across all machines. It works great, I can start doing changes on one machine and then pick up the work on another machine without interruption

[multiplied]

I was thinking about this, but how does syncthing handle conflicts?