Two people working on the same file
I don't know if I'm doing anything wrong, but I think the way the plugin works today, if another person changes the file I'm working on, when I pull the changes, I can either save mine anyway and overwrite, or revert and lose my changes. 

Are you currently working on a solution for that? 

Would it be possible to, instead of just overwriting the file, add the commit number to the file coming from the remote and keep both? This way I could resolve the conflicts and/or merge them manually. Just a thought. 

Awesome work, btw!

Thanks.
