Use --force-with-lease instead of -f / --force
Add file c
Modify c