search

android / camera-samples

Multiple samples showing the best practices in camera APIs on Android.
Apache License 2.0
5.02k stars 2.35k forks source link

Merge conflicts #505

Closed syslogic closed 2 years ago

syslogic commented 2 years ago

Referring to: https://github.com/android/camera-samples/pull/489

It is pretty obvious that the PR could have been directly merged, because the requested changes were just non-sense only to complain about something - and this resulted in a complete mess. I will not continue working on this, because my time has value.

donovanfm commented 2 years ago

Hi, syslogic. Are you saying that you are seeing changes you authored on the android:main branch?

I can't see your changes anymore in that PR, except for the one diff I commented on. If you look at that line in our main branch, you'll see that it's still the original line without your change.

syslogic commented 2 years ago

After patching it back I'm not that certain anymore, but now it's all a mess with tons of conflicts. And I probably won't merge that, because I only PR'd, because I've been asked to contribute some.

I was asked for GDE; but as it turned out, only race and gender matters. Of course I can only assume these criteria; this was kind of black-box test. And the annoying part is, that I've been asked and then have been ignored.

All I want is to have this CLA canceled, in order not to contribute anymore. This were 2 incidents, which happened within short time, which led up to this. Maybe only 1, but as an autist I take ignorance and (passive) discrimination serious. To me it rather seems Google has been infected with the woke virus and I don't agree; that's why I indeed consider Huawei, because the Chinese aren't into this non-sense. Frankly speaking, this woke-ism is quite toxic business politics ...as toxic, that it makes you want to run. Not suitable for me.

donovanfm commented 2 years ago

It sounds like you discovered this was a problem with version control and some merge conflicts. I'm going to close this issue since there's no problem with the repo itself.