Tinkerforge/generators — pull request #11 by NobodysNightmare (2012-05-11 14:25:24+00:00)
Title: C#: Unify networking for Windows Phone 7 and Rest of .NET

Hi,
for the Windows Phone Environment I reimplemented a basic network stream that features blocking Reads and writes.
It currently lacks most of the error handling, but at least it should handle those errors, that were handled by the old Windows Phone Code.

The new approach should lead to fewer implementation errors, as you only have to think about the two worlds in the new NetworkStream and while creating the socket (because WP has no "Connect" and Mono has no "ConnectAsync").

What happened last time?
-------------------------------------
This is about my last pull request. You told me that a manual merge was neccessary, however that looked quite weird in the network graph (the commits from my repo should have been the ancestors of your merge, but instead they were duplicated to your branch). The problem is, that my old commits are now again part of THIS pull request.

How did you do the last merge? I guess it was not "git fetch" followed by "git merge", looks more like cherry-picking or something exotic.

Good luck for merging... hope it does not blow up.

P.S.: I find myself frequently on stackoverflow, looking for solutions to the simplest git-questions :D