Merge vs rebase policy

[Martin Stjernholm, Roxen IS @ Pike developers forum]

Well, I like to separate updating and discarding changes, but sure,
it's a personal preference. In the second case though, when the mess
is the result of an update, one already got the latest version, and
then it's much quicker to skip the fetch.