I was working on a branch A cut from featA. So I was keeping A uptodate with featA. But there is another branch featB newly created and has slightly different commits than featA. Now I wanted to make my branch A uptodate with featB without featA changes. How can I do that? Any suggestions would be very helpful.
CodePudding user response:
try this
git checkout A
git fetch origin
git rebase origin/featB
CodePudding user response:
Another way to do this,
- git checkout A
- git pull origin featA (take update from featA )
- git pull origin featB (take update from featB )
Now branch A has all commits of featA and featB
