One thing that might help a lot with cross device edits is to auto commit very small changes frequenlty and rebase on pull instead of merge! That keeps the history linear and reduces those ugly conflict states when the same note was edited on two devcies..
One thing that might help a lot with cross device edits is to auto commit very small changes frequenlty and rebase on pull instead of merge! That keeps the history linear and reduces those ugly conflict states when the same note was edited on two devcies..