Comment by thexa4

You can create your own repo and also do a `git init` in the dropbox folder. Then configure both to point to each other as remotes. (`git remote add dropbox /path/to/dropbox`)

When merging stuff, make a commit if needed on the dropbox repo and merge in your changes. Then pull from your personal repo from the dropbox one.