So I created a branch off of another branch I was already creating, and now when I try to merge the branches into master, I have run into the situation where I have to merge both branches.
Here is a diagram
->Branch 1 -> Branch 2
I want to be able to merge just the changes on branch 2 onto master without having to merge the changes on Branch 1 if that makes sense. I looked into reset and revert, but it seems like these things will delete all the changes I made with branch 2. Any ideas?
Practice As Follows
Try git rebase –onto with the following syntax:
To put branch2’s changes on to the master without including branch1’s
git rebase --onto master branch1 branch2