We use a Jupyter extension called nbgitpuller to sync Jupyter Notebooks. nbgitpuller uses an "automatic merging behaviour" to sync changes between your local home directory and the upstream Git repo. Please consult the nbgitpuller documentation for details about this merging behaviour.
