You can use the account linking strategy. Demonstrated here:
Or follow this thread for a solution that uses a pre reg hook:
It is up to you, but the account linking will let the user sign in with either option. For example, they can sign up with an email/password and then later sign in using google.