I was told that I should follow the below steps if make new migrations in my branch and have merge conflicts with master in the I was told that I should follow the below steps
I was told that I should follow the below steps if make new migrations in my branch and have merge conflicts with master in the I was told that I should follow the below steps