To update a feature that you have been working on for a long period of time, with a new update of Master: –
1 2 3 4 |
Git checkout master //(be on master) Git pull upstream master //(this gets the update) |
Now get into the branch that’s behind: -
1 2 3 4 |
Git checkout feature-mynavigation //(you are now in feature-mynavigation) Git merge master //(this puts all the new changes into feature-mynavigation) |