How to handle 'error: untracked working tree files would be overwritten by checkout' in Git - Revision history