search

Techtonica / keyboard-shortcuts-practice

https://techtonica.github.io/keyboard-shortcuts-practice/
26 stars 56 forks source link

Merging Webpack configurations #123

Closed MariaKhantech closed 3 years ago

MariaKhantech commented 3 years ago

closes #94 Merging in the webpack configurations.

vegetabill commented 3 years ago

Other reviewers: let's wait on any code reviews until the conflict edits are done since it won't be possible to test.

MariaKhantech commented 3 years ago

I went ahead and resolved these conflicts in vscode. I am sorry I missed them. I cant find any more.

MariaKhantech commented 3 years ago

I went ahead and slacked you some issues. I had fixed the errors you mentioned but when I pulled to see if there would be more a ton came through.

MariaKhantech commented 3 years ago

All conflicts have been resolved. Let me know if you need anything else.

vegetabill commented 3 years ago

This was pretty close to merging. Not sure if you had time to look at any of the comments, @MariaKhantech ?

MariaKhantech commented 3 years ago

I can this weekend! I just have been prepping for an interview this thursday. I hope it is something that can wait until then?

On Mon, Oct 19, 2020 at 9:53 PM Bill DePhillips notifications@github.com wrote:

This was pretty close to merging. Not sure if you had time to look at any of the comments, @MariaKhantech https://github.com/MariaKhantech ?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Techtonica/keyboard-shortcuts-practice/pull/123#issuecomment-712537956, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOWI6TYAM65GTRV7QEEKWBTSLTUSFANCNFSM4SBC6K6A .

vegetabill commented 3 years ago

Yes for sure. Thanks for letting us know and good luck with the interview!

MariaKhantech commented 3 years ago

I went ahead and did all the changes as requested. I also fixed the merge conflicts.

MariaKhantech commented 3 years ago

All set! Let me know if there are any more issues!

On Wed, Oct 21, 2020 at 3:21 PM Bill DePhillips notifications@github.com wrote:

Yes for sure. Thanks for letting us know and good luck with the interview!

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Techtonica/keyboard-shortcuts-practice/pull/123#issuecomment-713820692, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOWI6T7HKMR6TBQXQVO6D33SL4YCHANCNFSM4SBC6K6A .

vegetabill commented 3 years ago

Hi @MariaKhantech just checking in if you'd had a chance to work on this?

alodahl commented 3 years ago

@vegetabill @MariaKhantech is this PR something that we can still use, or continue to work on? It's been here for a while now.

MariaKhantech commented 3 years ago

Hello,

I am sorry. I am unable to continue working on this project. I have a new job. I also am having hardships with a heavy-duty divorce and single mom now. I apologize. Thank you for letting me help at the Grace Hopper event.

On Tue, Jan 5, 2021, 11:15 AM Alina L. notifications@github.com wrote:

@vegetabill https://github.com/vegetabill @MariaKhantech https://github.com/MariaKhantech is this PR something that we can still use, or continue to work on? It's been here for a while now.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Techtonica/keyboard-shortcuts-practice/pull/123#issuecomment-754736438, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOWI6T767TZR6DVRO6SI5MDSYM3IZANCNFSM4SBC6K6A .

alodahl commented 3 years ago

Hi @MariaKhantech, no problem at all, we just needed to know the status of the PR. Congrats on the new job!

alodahl commented 3 years ago

@vegetabill do you think this would be easier for a volunteer to pick up from this branch, or start over?

vegetabill commented 3 years ago

Thanks for getting this started, @MariaKhantech

@alodahl I timeboxed an hour on this tonight and got it working: closing in favor of #147