Updated 063 Proposed Collaborative Workflow in JCB (markdown)

063-Proposed-Collaborative-Workflow-in-JCB.md

@@ -102,13 +102,13 @@ The next thing to do is to pull down the master branch. This is done with: `git
 
 [00:21:05](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h21m05s)
 
-In the Global Options there are two ways to compile the XML in JCB. The reason why there are two ways is because some servers don't support this one, this SimpleXMLElement Class option. It doesn't support it and mostly because it doesn't have all the PHP models of things applications activated. What we then have is a String Manipulation option which doesn't use the SimpleXMLElement but does [00:21:41](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h21m41s) replace most of the time and building all these XML field string by string. This one 'String Manipulation' is how JCB started and it is most certainly working very well. I like using it. But it isn't necessarily the best option. It's faster. If we compile it again, [00:22:03](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h22m03s) we will probably see less changes to the XML. Because I remember that package did use the String Manipulation option. To exit this just press 'Q' and again to go back in. Let's see what have changed. [00:22:28](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h22m28s) In fact I don't see any XML changes. It's just the date that has changed. It's talking about the build date. This is something we might need to look at because the reason why it's changed, is because we imported it. Your application things that you have build only started [00:22:51](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h22m51s) today. We have all the changes which are primarily the build date, and JCB itself has improved. It has improved this variable, determines that external value that's with the json string(see video). Remember, I said that we've done a little improvement. It is reflecting the JCB improvements which is the way it should be.>>>>>>> 
+In the Global Options there are two ways to compile the XML in JCB. The reason why there are two ways is because some servers don't support this one, this SimpleXMLElement Class option. It doesn't support it and mostly because it doesn't have all the PHP models of things applications activated. What we then have is a String Manipulation option which doesn't use the SimpleXMLElement but does [00:21:41](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h21m41s) replace most of the time and building all these XML field string by string. This one 'String Manipulation' is how JCB started and it is most certainly working very well. I like using it. But it isn't necessarily the best option. It's faster. If we compile it again, [00:22:03](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h22m03s) we will probably see less changes to the XML. Because I remember that package did use the String Manipulation option. To exit this just press 'Q' and again to go back in. Let's see what have changed. [00:22:28](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h22m28s) In fact I don't see any XML changes. It's just the date that has changed. It's talking about the build date. This is something we might need to look at because the reason why it's changed, is because we imported it. Your application things that you have build only started [00:22:51](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h22m51s) today. We have all the changes which are primarily the build date, and JCB itself has improved. It has improved this variable, determines that external value that's with the json string(see video). Remember, I said that we've done a little improvement. It is reflecting the JCB improvements which is the way it should be.
 
 ### git add - git commit -am"Updated the component with improvements made to JCB" - git push
 
 [00:23:36](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h23m36s)
 
-If we are going to make a pull request, we'll most probably will say thank you because you have updating the JCB improvements to the component. Let's show you how that will work. You would now make a commit. It should look something like this and remember I always show you the the simple easiest way to do it. There are more better, maybe difficult ways. git commit -am"Updated the component with improvements made to JCB". Click enter. Obviously you sign [00:24:19](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h24m19s) your commit, and git push. At this point you have made a change to component via your JCB install and you're pushing it back to your forked version of this Joomla Component which is on GitHub.  
+If we are going to make a pull request, we'll most probably will say, 'thank you', because you are updating the JCB improvements to the component. Let's show you how that will work. You would now make a commit. It should look something like this and remember. I always show you the the simple easiest way to do it. There are more better, maybe difficult ways. `git commit -am"Updated the component with improvements made to JCB"`. Click enter. Obviously you sign [00:24:19](https://www.youtube.com/watch?v=zlhFyrCGWik&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=63&t=00h24m19s) your commit, and `git push`. At this point you have made a change to component via your JCB install and you're pushing it back to your forked version of this Joomla Component which is on GitHub.>>>>>>>>  
 
 ### Refresh Page - One Commit Ahead - Discussion How Many Changes Before Making A Pull Request