We all face the same problem but there is no easy solution.
For my part, i use a mix of
- Dropbox (for revisions),
- a css import,
- Template overrides,
- Beyond Compare to get all the modified bits of code back each time i download the component because i insert a commented line to each modified part.