git rebase vs git merge

Published --
Recommendations