diff --git a/048-Tutorial-on-making-a-pull-request-at-Joomla-Component-Builder-Snippets.md b/048-Tutorial-on-making-a-pull-request-at-Joomla-Component-Builder-Snippets.md index 4b28b7f..657f3d4 100644 --- a/048-Tutorial-on-making-a-pull-request-at-Joomla-Component-Builder-Snippets.md +++ b/048-Tutorial-on-making-a-pull-request-at-Joomla-Component-Builder-Snippets.md @@ -14,13 +14,13 @@ This is a demonstration of the process of taking your committed changes to the f [00:01:43](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h01m43s) -This one will be the first step of doing a pull request. Once you are in your repository on GitHub and you have to push your changes up here, you'll see the message 'This branch is 4 commits ahead of vdm-io:master.' and be able to click on Pull request. We've done that. +Once you are in your repository on GitHub and have to push your changes up here, there will be this message 'This branch is 4 commits ahead of vdm-io:master.', then you will be able to click on 'Pull request'. ### Identifies If Forked [00:02:08](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h02m08s) -Next thing it will open a page where it identifies that you have forked vdm-io/Joomla-Component-Builder-Snippets. Master branch as the base. There's only one branch at the moment. Then your head of the fork that you've got is over here. [00:02:38](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h02m38s) If it's says to you that it's 'Able to do a merge', then you're in good shape everything shouldn't be more complicated. You can see that those commit messages you've made are showing up here and exactly every change that was done. You will see we changed it from Layout to Tables. [00:03:03](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h03m03s) It shows you that we've renamed it from FooTable - (Layout) FooTable.json - FooTable - (Table) FooTable.json. It identified that for us. We can see nothing of the Snippets have changed. You can scroll and see the snippet isn't changed, only Layout and Table and the date. Which is good for we want to be able to see when was the last change to the file. We can see that usage has a new [00:03:30](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h03m30s) description added. That means if I was to click on the link 'Added the accordion snippet', click there '788fc92' you will see that's exactly what he did. Added accordion snippet, and the same goes for every one of these commit messages. That's what I meant when I said giving good commit messages [00:03:56](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h03m56s) will make it so much easier for us to review the changes and to make sure that it is correct. If it is very complicated and difficult usually this kind of pull request will take longer. +Next thing it will open a page where it identifies that you have forked 'vdm-io/Joomla-Component-Builder-Snippets'. Master branch as the base. There is only one branch at the moment. Then the head of the fork that you have is over here. [00:02:38](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h02m38s) If it indicate that it is 'Able to do a merge', then you are in good shape. Those commit messages you have made are showing up here and exactly every change that was done. You will see that it is changed from 'Layout' to 'Tables'. [00:03:03](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h03m03s) It shows that it had been renamed from 'FooTable - (Layout) FooTable.json - FooTable - (Table) FooTable.json'. Nothing of the Snippets have changed, only 'Layout' and 'Table' and the 'Date'(to see last change to the file). A new description has been added to'usage'. [00:03:30](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h03m30s) That means if the link 'Added the accordion snippet' is used, and '788fc92'is clicked, you will see that is exactly what he did. It added the Accordion snippet, and the same goes for every one of these commit messages. [00:03:56](https://www.youtube.com/watch?v=vQ-yxVtc-Co&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=00h03m56s) Good commit messages will make it so much easier for us to review the changes and to make sure that it is correct. If it is very complicated and difficult this kind of pull request will take longer. <<<<<<< ### Commit Smaller Amount of Snippets Instead Of Bulk