Resolving .c9revisions and other git problems