Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I have a Hotfix and Trunk branches, so I need to merge fixes to my trunk.
All the guides tell me that I must first update to Trunk then merge with Hotfix.
That works, but I want to make subsequent merges, for instance if the fixes are really urgent. So I do not want to update to Trunk every time.
So the question is: Is there any way to merge my hotfix changes without updating to Trunk branch every time?
No. You must always be updated to the branch that you wish to continue.