git merge conflict due to renaming in two branches - how to fix & avoid in future?

Question

I have two local branches master and dev. Both branches contained three folders:

projectBeta
project
project_v1

I wan

Answer 1

try this

git pull

go to folder to delete project and project_v1, rename projectBeta to project.

git add --all
git commit 
git push

and you do the same for other branch