search

RoboTutorLLC / RTFace_Login

1 stars 1 forks source link

2022 11 17 video launch corruption fix #34

Closed madeleinvillegas closed 1 year ago

JackMostow commented 1 year ago

@madeleinvillegas - I started to review pull request https://github.com/RoboTutorLLC/RTFace_Login/pull/34 for 2022 11 17 video launch corruption fix. However, you closed it around noon 11/21/2022 "but the 2022-11-17-video-launch-corruption-fix branch has unmerged commits." Except for changing versions of jdk and build.gradle, all the merges were merging the development branch into apk_generation, so I'm guessing it was a mistake and that's why you closed the PR.

The 2022-11-17-video-launch-corruption-fix branch is 10 commits ahead, 1 commit behind development. Is it ready to merge into development? I assume not yet, or you would have made a pull request to do so.

Please advise. Thanks! - Jack

madeleinvillegas commented 1 year ago

Yes, it was a mistake. I thought @rohankulkz pushed his changes regarding the media player, so I opened a pull request. I closed it after realizing the push did not happen.

JackMostow commented 1 year ago

@madeleinvillegas -- So the next steps are:

  1. Rohan push his changes to the 2022-11-17-video-launch-corruption-fix branch. He just did (12/1/2022).
  2. Merge development into it, but it's not ready yet.
JackMostow commented 1 year ago

We weren't sure which type of merge to use, so we tried rebase but it failed. We used merge commit for fear that squash commit would be hard to untangle if it fails.