Hi Jeremy, It works now. I'd been using the patch option (getting the pull request into a patch and applying) since some bad experiences using merge. My git fu is too weak.
Thanks for the contributions. -Pieter On Wed, Nov 10, 2010 at 4:15 PM, jeremy avnet <[email protected]> wrote: > Hi, Pieter. > > I just did a git pull from the imatix/zguide master and a git push to my own > fork. The merge was clean. Not sure why your patch is touching those identity > files as they are already the same in both repos. > > Let me know if you are still having problems. The new pull request is here: > > https://github.com/imatix/zguide/pull/18 > > .:. jeremy > > > On Nov 10, 2010, at 4:18 AM, Pieter Hintjens wrote: > >> Jeremy, >> >> The pull request failed (I'm applying as a patch): >> >> Applying: Better comment about how identity is being set >> error: patch failed: examples/C++/identity.cpp:10 >> error: examples/C++/identity.cpp: patch does not apply >> error: patch failed: examples/C/identity.c:8 >> error: examples/C/identity.c: patch does not apply >> error: patch failed: examples/Common Lisp/identity.lisp:17 >> error: examples/Common Lisp/identity.lisp: patch does not apply >> Patch failed at 0001 Better comment about how identity is being set >> >> >> Could you update your git, and try again? >> >> Thanks >> Pieter >> >> On Tue, Nov 9, 2010 at 6:59 PM, jeremy avnet <[email protected]> wrote: >>> This code is licensed under the MIT/X11 license. >>> >>> https://github.com/imatix/zguide/pull/17 >>> >>> .:. jeremy >>> >>> _______________________________________________ >>> zeromq-dev mailing list >>> [email protected] >>> http://lists.zeromq.org/mailman/listinfo/zeromq-dev >>> >>> >> _______________________________________________ >> zeromq-dev mailing list >> [email protected] >> http://lists.zeromq.org/mailman/listinfo/zeromq-dev > > _______________________________________________ > zeromq-dev mailing list > [email protected] > http://lists.zeromq.org/mailman/listinfo/zeromq-dev > > _______________________________________________ zeromq-dev mailing list [email protected] http://lists.zeromq.org/mailman/listinfo/zeromq-dev
