I want to keep my local copy of satchmo in sync with the online
version. I know this is easy with SVN, however, I routinely modify
templates and views while maintaining a local SVN of my project. How
can I keep satchmo up to date while still be able to keep my local SVN
and any edits I make?