Re-committing overwritten changes