A retenir :
Use merge in cases where you want a set of commits to be clearly grouped together in history Use rebase when you want to keep a linear commit history DON’T use rebase on a public/shared branch