Okay, I changed my mind. I think it's best to separate these content branches cleanly; otherwise merging back from master into assets will always try to delete the assets folders