docs: howto resolve migration conflict#590

fyliu wants to merge 1 commit intohackforla:mainhackforla/peopledepot:mainfrom

fyliu:442-howto-resolve-migration-conflictsfyliu/peopledepot:442-howto-resolve-migration-conflictsCopy head branch name to clipboard