Reputation: 4353
I have the following structure:
----parent_branch
|
------ my_branch
I have worked in my_branch so far, and important changes were made in parent_branch. I want to merge only those changes into my_branch, without messing-up what I've worked on in my_branch. How can I safely do that?
Upvotes: 5
Views: 7040
Reputation: 9297
It's as easy as to Follow Below Steps :
git checkout my_branch
git merge parent_branch
git push origin my_branch
Upvotes: 6