Harald Welte wrote: > If you're working on some private branch on a particular feature, please > rebase that private branch on current master before pushing the changes.
Avoid automatic merges by setting rebase=true on branches. (Equivalent of git pull --rebase) //Peter
