I have two branches in my Git repository:
2. child (created originally from master)
I created a child intending to quickly merge it back into master. However, that was three months ago and the code in this branch is 13 versions ahead of master.
It has effectively become our working master branch as all the code in the master is more or less obsolete now.
The very bad practice I know, lesson learned.
Do you know how I can replace all of the contents of the master branch with those in a child?
I could just delete everything in master and merge, but this does not feel like a best practice.