Git Resolve Your Current Index First