I got some git-flow issue. I have a master and a dev branch. My dev branch has updated code and I made a feature branch from it. Now I got a situation that I need same master code in my existing dev branch.
I have few solutions but I don't know which is best practice:
- Make another dev branch and delete the existing one.
- Delete existing code from dev and make it the same as master.