| *** jelkner has quit (Quit: Leaving) | 12:26 | |
| *** tboimah has quit (Ping timeout: 480 seconds) | 14:35 | |
| *** tboimah has quit (Quit: Leaving) | 14:47 | |
| scooper | Hello shmohamud | 17:19 |
|---|---|---|
| scooper | Thanks for coming through | 17:19 |
| shmohamud | Hi Scooper | 17:19 |
| shmohamud | It's my pleasure | 17:19 |
| scooper | Did you see the video I send you on whatapp?? | 17:19 |
| shmohamud | So, do you want to share the link to the repo or do you want some help deploying your code to Github? | 17:19 |
| shmohamud | Yes, I saw it. Lots of changes, it looks good | 17:19 |
| scooper | The is a issue here | 17:20 |
| scooper | Which I want to share with you | 17:20 |
| scooper | I worked on the about page and it working perfectly both on desktop, tablet and mobile | 17:20 |
| scooper | I ever push it on my branch in the social justice computing repo. but the issue here | 17:21 |
| scooper | is that it's not reflecting there... | 17:21 |
| shmohamud | ok | 17:21 |
| scooper | though github is saying I make a commit 12 hours ago | 17:22 |
| shmohamud | what IDE are you using? | 17:22 |
| scooper | Visual Studio code | 17:22 |
| shmohamud | ok, go to the terminal and type "Git Status" and tell me what you see | 17:22 |
| scooper | ok | 17:22 |
| scooper | please check your whatapp | 17:23 |
| scooper | I send you a picture | 17:23 |
| shmohamud | Ok I see it | 17:24 |
| shmohamud | The issue is you need to do a "git add . " | 17:24 |
| shmohamud | make sure you include the period at the end. | 17:24 |
| scooper | I did all of that | 17:24 |
| shmohamud | do it again please. | 17:24 |
| shmohamud | Then, try git status again please. | 17:24 |
| scooper | let me tell you what I did | 17:24 |
| shmohamud | And show me what you see. | 17:24 |
| scooper | first this is what I did | 17:24 |
| scooper | git add . | 17:24 |
| scooper | git commit -m "rebrand the about page" | 17:25 |
| shmohamud | ok, I believe you, but to be sure, please do it again | 17:25 |
| shmohamud | then try git status | 17:25 |
| scooper | git push origin spencer | 17:25 |
| shmohamud | and let me know what you see. | 17:25 |
| scooper | ok | 17:25 |
| scooper | I just did | 17:26 |
| scooper | please check your whatapp | 17:26 |
| scooper | I send image | 17:26 |
| shmohamud | Ok I see. | 17:27 |
| shmohamud | It worked! | 17:27 |
| scooper | let me check the repository | 17:27 |
| shmohamud | I see some changes. So, you changed a few lines in the about, related to Ved's section. And, some CSS, related to member-details | 17:32 |
| *** scooper has quit (Read error: Connection reset by peer) | 17:32 | |
| scooper | Shanun | 17:32 |
| scooper | did you see the image on whatapp | 17:32 |
| shmohamud | I see some changes. So you changed a few lines in the About.html related to Ved's section. Also some CSS related to member-details. Is that correct? | 17:32 |
| shmohamud | Yes I see it. | 17:32 |
| scooper | That is not what I expect to see | 17:33 |
| scooper | if you clone my branch | 17:33 |
| scooper | it will not display what I shown you on whatapp | 17:33 |
| scooper | Secondly it's not allowing me to merge into the main branch. This is strange | 17:34 |
| scooper | Can I call you | 17:34 |
| scooper | this will help speed thing up | 17:34 |
| *** shmohamud has quit (Remote host closed the connection) | 17:35 | |
| *** shmohamud has quit (Remote host closed the connection) | 17:38 | |
| shmohamud | git fetch origin | 17:51 |
| shmohamud | git diff --name-status master..origin/master # ditto for 'staging' | 17:51 |
| shmohamud | git diff --name-status master..spencer | 17:51 |
| shmohamud | # local differences | 17:51 |
| shmohamud | Hi scooper | 18:06 |
| shmohamud | we got disconnected | 18:06 |
| shmohamud | try this (1) git checkout main | 18:06 |
| shmohamud | (2) git rest --hard spencer | 18:07 |
| shmohamud | **correction: (2) git reset --hard spencer | 18:07 |
| shmohamud | (3) git push --force origin main | 18:08 |
| shmohamud | This is a bit risky, because I'm not exactly sure what I'm doing here. But it might work. If it doesn't work, I'm sorry but I think you will have to simply check out main with a new branch | 18:09 |
| shmohamud | add a git remote for that new brinch | 18:09 |
| *** scooper has quit (Ping timeout: 480 seconds) | 18:09 | |
| shmohamud | then, copy paste the files from the spencer branch that have changed | 18:09 |
| shmohamud | into the new branch, page by page. | 18:10 |
| *** shmohamud has quit (Remote host closed the connection) | 18:14 | |
| *** shmohamud has quit (Ping timeout: 480 seconds) | 19:21 | |
| *** shmohamud has quit (Ping timeout: 480 seconds) | 23:21 | |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!