i have somehow gotten my EF5 project into a state where I can\'t proceed.
When I do an \'update-database\' i get:
Unable to update database to
Update-Database –TargetMigration
Add-Migration
You need to include the timestamp so that migrations knows you want to edit the existing migration rather than scaffolding a new one. This will update the metadata for the last migration to match the current model.
Update-Database
Source https://docs.microsoft.com/en-gb/ef/ef6/modeling/code-first/migrations/teams#resolving-the-merge-conflict