Git

Merge 
 
 Merge: git merge origin/architecture 
 
 Squash (on remplace tout par un seul commit): git merge --squash origin/architecture 
 
 Rebase (un jolie merge): git rebase origin/architecture