On 07/05/2015 17:42, Marvin Humphrey wrote:
This very large branch does not merge cleanly and is going to get harder to
merge over time. Should we concentrate on getting it done and hold off on
other merges until it is in?
I rebased the branch and started to merge it:
https://github.com/nwellnhof/lucy-clownfish/commits/cfc_symbol_v3
When rebasing one of the changes, I had to adjust some Go-related code:
https://github.com/nwellnhof/lucy-clownfish/commit/ad6e08984c09aeb9664f44170135ea4fb5d9734a#diff-44d73b464e29b0aa45fd6058111dc60b
Does this look OK?
Nick
