EwaldBorger

# note: not recommended to use, but might be handy if your are in the same situation
# helped me a lot
# premise: you have a repository PIECE that you want to integrate into current repo WHOLE
# but of course maintenance and features are still merged in to WHOLE
# so we have a branch 'single-directory' in PIECE where we moved everything into the one directory
# we make a new branch 'assimilation' in WHOLE where we merge in PIECE/single-directory
# anything we want to do after, we do in a new branch one WHOLE from 'assimilation' called 'fixes'
# on update, we delete 'assimilation', create it a new and rebase 'fixes' on it and carry on
# this script is run on your local checkout of WHOLE
# when you are finally ready, you squash merge WHOLE/fixes into WHOLE/assimilation

EwaldBorger

# Copying photos from synology to nextcloud.

# Situation:
# a synology with a "drive" with photos, some in nice year/month directories, others not so much
# a new nextcloud machine with a big drive and cli access

# 1. create NFS share in Synology DSM
# 2. mount it on the nextcloud machine
# mount -t nfs 192.168.2.20:/volume1/photo /syno
# 3. copy with preserving timestamps to a temp location