Martin, [email protected] said: > > regarding patches by email, if you want to apply this as-is automatically > > (which means I won't get any conflicts when I pull next, and it eliminates > > as many manual steps on your end as possible, both of which is good), > > you want to save the email as source (i.e. the raw text with headers) and > > then you can just pipe it to git-apply. > > The patch is applied, however, I've changed it a little to improve > overall readability, thus I haven't had chance to test the email thing.
Thanks. However, given that you changed the patch that now means I get: Auto-merging src/pipe.cpp CONFLICT (content): Merge conflict in src/pipe.cpp Of course I can resolve this, but the point is not to have to deal with the conflicts in the first place. I'd suggest that a way to work with patches from other people is to reply to the patch and ask them to make the changes. This workflow has several benefits: 1) The contributor has feedback on the quality of his/her patch 2) The contributor does the work instead of you :-) 3) If the resulting patch is applied verbatim there should not be any conflicts when the contributor pulls into their repository. -mato _______________________________________________ zeromq-dev mailing list [email protected] http://lists.zeromq.org/mailman/listinfo/zeromq-dev
