Leaving all the technicalities aside.....
Branch when you know its easier to merge back!
Keeping in mind that merging will always be effected with how the work is carried out in a project.
Once this achieved all the other tertiary issues will come in to play.