Added descriptive links to the following lessons. Related to #28290 #28352
Conversation
There was a problem hiding this comment.
Looks like your fork is out of sync with TOP's repo (upstream), so you were editing older versions of these lessons than what we currently have. Therefore, there are a few merge conflicts to resolve with all three files.
You can either resolve them yourself in this branch, or if you're not sure how best to resolve them, you could checkout back to main in your clone, update your clone's main branch via git fetch upstream main && git merge upstream/main, then create a new branch off main (which will now be up to date). You can do your changes in that branch and open a fresh PR. If you do open a fresh PR with your new up-to-date branch, you can close this PR and delete the branch for this one.
Do whichever you're more comfortable with. Whenever you make a new branch off main for a new PR, you should always checkout to main and update it before making the branch (refresher from "Using Git in the Real World").
|
Just say what would be easier — probably doing it again from the start. I don't know how I keep messing it up. So I need to close the PR and do it again. |
|
You just didn't realise that your existing fork hadn't been updated with TOP's latest changes, hence the merge conflicts since a lot of changes were made to the three lesson files since, and your changes clash with the current versions. In this case, easier would be to close this PR and open a new one after updating your local fork.
|
|
Ah. Okay. I have been doing it backwards. My bad. |
|
No need to worry about it. People are bound to make mistakes when unfamiliar. I've had my fair share, that's for sure. |
|
Hello. So I forked and then cloned the repository. Then I connected to the repository and used the commands to update my clone's main branch. I created the branch and made the changes. I followed the lessons, but I am confused. I should be able to push changes from my branch, right? Because I understand I can't, but I should open a PR. Unfortunately, I don't remember what I did yesterday. I reread the lessons multiple times, but in my opinion, I should be able to push to open a PR like yesterday. |
|
You need to push your changes in your branch. Then you can come to GH and open a PR from that branch to TOP's repo, but yiu need to push first. After pushing, if you go to your fork on GH, you'll see a notification to compare and open a PR, which will allow you to do that. Alternatively, you can go to TOP's repo's PR page and manually open a new PR from there. |
|
I am trying, but it says it doesn't have those rights. This is really hard. I made sure that I was on the same branch, and I followed what you said yesterday. I basically did it twice just to make sure, but I can't wrap my head around why I am stuck with this. I give up better to find someone else. |
|
I'm at a PC now - feel free to DM me on Discord since it'll make it easier to diagnose and share screenshots etc. |
Because
Added descriptive links text to the following lessons.
This PR
Issue
Related to #28290
Additional Information
Pull Request Requirements
location of change: brief description of changeformat, e.g.Intro to HTML and CSS lesson: Fix link textBecausesection summarizes the reason for this PRThis PRsection has a bullet point list describing the changes in this PRIssuesection