Re: A super newbie git-related question

[kaushalmodi]

> git rebase is much better than git merge for branches because it keeps the 
> history clean.

Yes, please do not do merges if the commit history can be linear (using 
rebases, cherry picks, etc).