resolve git file changes