[Numpy-discussion] Another merge at github

[Stéfan van der Walt]

On Sun, Oct 17, 2010 at 12:23 AM, Charles R Harris
<charlesr.harris at gmail.com> wrote:
>
> IIRC, they recommended pushing from local branches to master on github and
> not merging master to the development branches. That doesn't sound right to
> me, but perhaps I misunderstood...

The idea is not to keep merging the master branch into your
development branch to keep up to date (this makes for really ugly
history).

For single commits, merge back into master (hopefully this should be a
fast-forward merge), which then creates an svn-like timeline.

For bunches of commits, merge back into master with the --no-ff switch
to ensure that a merge message is generated (this makes it much easier
to find those grouped commits later).

After the merge, push back upstream.

Regards
Stéfan