git merge ¶
Git branching and merging ¶
git merge [nom-de-branche] ¶
git merge [nom-de-branche]
fusion dans la branche courante des commits de la branche.
git merge [depot]/[branche] ¶
git merge [depot]/[branche]
fusionne la branche du dépôt dans la branche locale ?
Merge a branch ¶
To merge some_fixes branch into feature branch:
git checkout feature
git merge some_fixes