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@python.org
http://mail.python.org/mailman/listinfo/cython-devel

Reply via email to