robbyrussell/oh-my-zsh — pull request #2071 by UncleBill (2013-08-31 23:27:35+00:00)
Title: rebasing easily makes confilict and harm co-developing flow

discussed in https://github.com/robbyrussell/oh-my-zsh/pull/1908#commitcomment-3936333