[Cython] Git workflow, branches, pull requests

[mark florisson]

On 5 May 2011 22:22, Stefan Behnel <stefan_ml at behnel.de> wrote:
> Dag Sverre Seljebotn, 05.05.2011 21:52:
>>
>> There was just a messup in git history: Mark's OpenMP pull request got
>> merged twice; all commits show up two times.
>
> What (I think) happened, was that Vitja pulled in Mark's changes into his
> unreachable code removal branch, and they ended up in his pull request. I
> guess I was assuming that git wouldn't care too much about branch
> duplication, so I just accepted the pull request via the web interface.
> Apparently, it did care.
>
> I tend to rebase my local change sets before pushing them, and I think it
> makes sense to continue doing that.
>
> Stefan
> _______________________________________________
> cython-devel mailing list
> cython-devel at python.org
> http://mail.python.org/mailman/listinfo/cython-devel
>

Whatever approach we take, it should be documented extensively on the
hackerguide, at least the rebase approach, as it has apparently
somewhat catastrophic results if not everyone does it.

On the one hand rebasing gives you a nice history, but on the other
hand it's also a bit harder to use and if you start merging at some
point reverting to rebasing is not so easy. So perhaps we should just
ignore the 'merge' commits (using command line git, git log
--no-merges) and pull and push away.