git rebase vs. git merge

[KaoutherElhamdi]

When you want to merge your own branch into the main one, which one do you recommend to use : git rebase or git merge ?? And why ??

[khoipro]

git rebase is a better solution with a clean tree while git merge might have many branches which seem hard to follow.

[rjbell4]

Rebase if you like a linear history; merge if you have a lot of developers and multiple branches, and want a record of what merged where and when