Help
cancel
Showing results for 
Search instead for 
Did you mean: 
Highlighted
Copilot Lvl 2
Message 1 of 2

updating a fork from a branch

Hi all,

 

first, thanks to everyone that answered my last question, was very much appreciated.

 

This is almost, but not quite, the same sort of question.

 

Programmer X owns the master branch. Programmer Z owns a branch of that master. I have a fork of Programmer Z's branch. He's merged my changes to his branch, but he's made other changes and now I need an updated fork of his branch.

 

Can I do this from the command line, if so, how?

If I have to use github's gui, then how do I do this? I really don't want to delete my fork and refork from his branch.

1 Reply
Highlighted
Community Manager
Message 2 of 2

Re: updating a fork from a branch

Hi @crystalwizard,

 

Thank you for being here! What you are describing is `merging` your changes to the feature branch. 

 

$ git checkout feature
$ git merge master

I hope this helps,
Andrea

Mark helpful posts with Accept as Solution to help other users locate important info. Don't forget to give Kudos for great content!