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’m using git and I have a repo with a bunch of branches.
If I do a hotfix on branch master (or another branch), how can I easily merge this fix into all those branches. Do I have to merge each branch one by one (like so: Merging one change to multiple branches in Git) or is there an easier way?
I’d recommend you have a look at git flow and it’s tool support.
The hotfix support of git flow is creating a bugfix branch which can be merged into your production branch (probably
master) and your development branch (in git flowdevelop). The hotfix branch starts frommaster. Since all changes of master are merged intodevelopafter each release you can merge the hotfix branch intodevelopas well without having to merge commits you didn’t intend to be merged.