Clever Geek Handbook

Rebase From master to another branch

I found some errors in the history of the transaction. I used these steps to fix them and resolve any conflicts. Now my master branch is fine. But I have another branch. Let's call it "Branch 1": enter image description here

I would like to apply the changes I made to the master branch also to branch 1. I made the changes to the orange commit. I resolved all conflicts up to the last commit of the master branch. How can I apply these changes to branch 1 as well?

+3


source to share


1 answer


You can cherry-pick the commit you want. It would be best to get the changes from another branch.



0


source






More articles:


All Articles