Git merge hotfix branch into feature branch Git merge hotfix branch into feature branch git git