rebasing easily makes confilict and harm co-developing flow

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