[ANN] global header move on Tuesday 2013-04-23 between 1200UTC and 2000UTC
Noel Grandin
noel at peralex.com
Tue Apr 23 06:36:51 PDT 2013
On 2013-04-23 15:29, Stephan Bergmann wrote:
> On 04/23/2013 03:09 PM, Bjoern Michaelsen wrote:
>> Why are you rebasing daily? I work on patches and rebase them once
>> directly
>> before pushing them to master sparing myself a lot of pain (and severely
>> reducing the risk of ending up with rebasing on a broken master
>> etc.). I can
>> see others doing the same.
>
> An alternative model is to "pull often, push often." Sure, it causes
> your builds to fail regularly due to a regularly broken master. But
> fixing that at least helps you increase your commit count on ohloh.
> And, more importantly, it helps you avoid having to maintain what is
> effectively your private local branch.
>
>
I rebase once a week because my changes have a high likelihood of
triggering conflicts.
And having a long chain of conflicts is pretty much guaranteed to
trigger problems with git.
And I "push seldom" to reduce the reviewing workload on Stephan :-)
Sigh. Rock and hard place.
Disclaimer: http://www.peralex.com/disclaimer.html
More information about the LibreOffice
mailing list