Hi I am interested in how the git functionality works. How do you let the users deal with potential merge conflicts? How often do you commit and push? With every character that is typed or after the document is closed? Are branches used at all or do you stay on one main branch?
- I just use the local version always and don't deal with any of the conflicts. It is however in the top 10 issues to fix.
Since the history is still preserved, no data is lost.
- I commit and pull + push each time a note is modified / created / deleted. And whenever you pull to refresh or tap the sync button. Optionally, this can be disabled, and it will only pull+push when you press the button.
- I only stay on the main branch, the user has an option to switch branches. I have no plans and no requests / use-cases for doing anything more with branches.
