Re: [Cython] Git workflow, branches, pull requests

2011-05-12 Thread Ondrej Certik
Hi, On Thu, May 5, 2011 at 12:52 PM, Dag Sverre Seljebotn wrote: > There was just a messup in git history: Mark's OpenMP pull request got > merged twice; all commits show up two times. > > It doesn't matter, since the two openmp branches with the same changes > merged OK, but we shouldn't make th

Re: [Cython] Git workflow, branches, pull requests

2011-05-12 Thread Dag Sverre Seljebotn
On 05/13/2011 12:36 AM, Ondrej Certik wrote: Hi, On Thu, May 5, 2011 at 12:52 PM, Dag Sverre Seljebotn wrote: There was just a messup in git history: Mark's OpenMP pull request got merged twice; all commits show up two times. It doesn't matter, since the two openmp branches with the same cha