search

roundware / roundware-ios-framework-v2

Roundware framework, updated for api v2 and re-built in Swift (as much as possible)
MIT License
1 stars 8 forks source link

Implement client-side mixing #48

Closed loafofpiecrust closed 4 years ago

loafofpiecrust commented 5 years ago

Replaces all server-based mixing functionality with a client implementation that's significantly more efficient and flexible for different projects. Not quite ready to merge, but making the PR here as a bookmark.

hburgund commented 5 years ago

This is great to get this process started; I agree we are close to a good point to merge back into origin. Maybe it is premature to look at this yet, but the merge commit of develop back into client-mixing is confusing me a bit. Is this because updates were made to develop after you had already branched into client-mixing? I am seeing some unexpected stuff like the PATCH assets/ work being removed? Just want to make sure we are careful about this as I don't want to lose anything accidentally.

loafofpiecrust commented 5 years ago

@hburgund So what happened there is there was some manual copying that happened before, but this actual merge created duplication because of that, so the merge commit cleared duplicate code out.

hburgund commented 5 years ago

OK, interesting; so the things that are deleted won't actually be missing when the merge happens?

This actually makes sense as the diff that is provided in my git client only shows a few relatively minor lines changing and doesn't indicate anything about the larger chunks. I guess my git client is pretty smart ;-)