Don't think you can merge them and keep both histories. Whenever we take branches we merge changes into both the current dev branch and the release_X branch.
This site uses cookies to help personalise content, tailor your experience and to keep you logged in if you register.
By continuing to use this site, you are consenting to our use of cookies.