Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0
Merge-vs-rebase is a common point of disagreement among Git users.
Although I typically rebase, sometimes merging is better. My impression
is that you really need to know what you're doing, regardless of whether
you're merging or rebasing.