Reputation: 893
In the following situation, how can I "update" the simon_master branch to include all the merged changes from the rene_master branch? My ideal scenario would be to have the simon_master branch just branch out from the rene_master again after the most recent commit shown. What would you do?
Cheers,
S
Upvotes: 0
Views: 54
Reputation: 325
This seems like a fast-forward merge so you should have no problem simply merging the Rene_Master
branch into the simon_master
branch.
In the terminal I'd do:
> git checkout simon_master
> git merge Rene_Master
Upvotes: 2