I started the day on Git Calisthenics. I used the mkdir command to make a new directory called test. I also used the rmdir -R command to remove a .git folder I had created. I crossed my fingers that nothing would go wrong when I did that.
I used this command:
To allow me to open a README.txt file straight from the command line. That was cool. The command to open the file was subl README.txt. Since I had already done the git init and created the file and modified it on my computer, after creating a new repository on GitHub, I used these two commands to import the data from my computer up to GitHub (this is called pushing):
I used this command:
To allow me to open a README.txt file straight from the command line. That was cool. The command to open the file was subl README.txt. Since I had already done the git init and created the file and modified it on my computer, after creating a new repository on GitHub, I used these two commands to import the data from my computer up to GitHub (this is called pushing):
git remote add origin https://github.com/Adancode/git_calisthenics.git
git push -u origin master
So now the README.txt file is up on GitHub. We create a new branch like s:
git checkout -b name_of_a_new_branch
And we jump to a different branch like so:
git checkout name_of_other_branch
To merge branches, first go to the target branch, then merging always happens INTO wherever you are. So first go to the branch you want to go to, like:
git checkout master
And then:
git merge other_branch_to_merge
I learned that it's actually conventional to merge master into the branch, and once all conflicts are resolved, we then merge the branch into the master. When looking at a merge conflict, HEAD is the branch we are currently sitting in. If you are merging master into a branch, then below HEAD, you will see master. We resolved a merge conflict, then pushed the changes to GitHub.
The next section of the Basics section is a project called "Getting Comfortable with Git and the Command LIne." Now, the first time i worked on a project using GitHub, I was able to complete the project itself and upload it to GitHub, but I was not able to get my project added to The Odin Project's webpage, I just wasn't sure how to do that. I'm starting this new project right now, and I'm hoping this project will show me how to do that, and then perhaps I can go back and get my other project posted! That would be pretty great...all right, let's start.
So, after working through the initial video regarding the new project, I went back and submitted a pull request (the "easy" way) requesting my google-homepage project's inclusion into The Odin Project's webpage. I'm looking at my open pull request right now...I swear if it actually gets added to the curriculum, if I actually submitted the pull request correctly, I will jump for joy, haha.
O.k., looks like I submitted it correctly and it has been accepted! However, it's not live on the site yet, but it should be live on the site as soon as The Odin Project's GitHub repo gets pushed/deployed again with all of the latest updates. I'm stoked.
So then we went over a diagram that shows how GitHub works when you want to update something more complicated than a single file. I liked the diagram a lot, here it is:
I thought it would be a nice screenshot to have in case I need to quickly refresh myself on the GitHub workflow. However, due to the fact that many times the repository you initially forked will have changed by the time you are ready to send your pull request, so that your original fork is then out of date, the workflow changes a bit:
This newer workflow incorporates the git remote add upstream url_of_the_original_repo_on_githup, which will add a new remote repository copying the original. Then, we run the git pull upstream master command, which does the same thing for the master branch. I finished the assignment, defining AJAX, Git, and CMS, then forking the necessary repo, cloning it onto my computer, entering the definitions into the readme file, then saving the file and adding it to the staging area, then committing my changes, then adding the upstream master repo to my computer to make sure my fork is still up to date, then merging the upstream/master branch into the branch we are currently on (in this case master).
I finished the Basics section today, as well as finally getting my google-homepage project added to the student solutions. I'm really proud of that and looking forward to the website updating with my solution. That was a lot of GitHub, and I am extremely glad to have all these resources available to facilitate so much learning. I like GitHub, it's a fantastic tool, and it's also very simple to use, it's just a matter of using it over and over until the steps become second nature. What a fantastic day.
O.k., looks like I submitted it correctly and it has been accepted! However, it's not live on the site yet, but it should be live on the site as soon as The Odin Project's GitHub repo gets pushed/deployed again with all of the latest updates. I'm stoked.
So then we went over a diagram that shows how GitHub works when you want to update something more complicated than a single file. I liked the diagram a lot, here it is:
I thought it would be a nice screenshot to have in case I need to quickly refresh myself on the GitHub workflow. However, due to the fact that many times the repository you initially forked will have changed by the time you are ready to send your pull request, so that your original fork is then out of date, the workflow changes a bit:
This newer workflow incorporates the git remote add upstream url_of_the_original_repo_on_githup, which will add a new remote repository copying the original. Then, we run the git pull upstream master command, which does the same thing for the master branch. I finished the assignment, defining AJAX, Git, and CMS, then forking the necessary repo, cloning it onto my computer, entering the definitions into the readme file, then saving the file and adding it to the staging area, then committing my changes, then adding the upstream master repo to my computer to make sure my fork is still up to date, then merging the upstream/master branch into the branch we are currently on (in this case master).
I finished the Basics section today, as well as finally getting my google-homepage project added to the student solutions. I'm really proud of that and looking forward to the website updating with my solution. That was a lot of GitHub, and I am extremely glad to have all these resources available to facilitate so much learning. I like GitHub, it's a fantastic tool, and it's also very simple to use, it's just a matter of using it over and over until the steps become second nature. What a fantastic day.
SUMMARY OF CODING SKILLS
Total Treehouse Points: 5,385
Treehouse Points by Subject Matter (Miscellaneous not included):
HTML: 663
CSS: 1,599
Design: 1,193
Development Tools: 747
Javascript: 1,120
Treehouse Ranking (%): "You have more total points than 94% of all students."
Treehouse Badge(s) Earned Today:
Treehouse Courses Completed:
How to Make a Website
HTML
CSS Foundations
CSS Layout Techniques
Aesthetic Foundations
Design Foundations
Adobe Photoshop Foundations
Adobe Illustrator Foundations (66% complete, switched focus from web design to web dev)
Git Basics
Introduction to Programming
Javascript Basics
Codecademy (& other) Courses Completed:
HTML and CSS (Codecademy)
Design Foundations
Adobe Photoshop Foundations
Adobe Illustrator Foundations (66% complete, switched focus from web design to web dev)
Git Basics
Introduction to Programming
Javascript Basics
Codecademy (& other) Courses Completed:
HTML and CSS (Codecademy)
Books Read or in Progress:
Completed: "Head First HTML and CSS," by E. Robson & E. Freeman
In Progress: "Eloquent JavaScript," by Marijn Haverbeke (On pg 27)
In Progress: "Head First Javascript," by Eric Freeman and Elisabeth Robson (On pg 56)
In Progress: "A Smarter Way to Learn Javascript," by Mark Myers (on pg 33)
My Progress on The Odin Project:
1. Introduction to Web Development 100% Complete
2. Web Development 101 29% Complete
3. Ruby Programming 0% Complete
4. Ruby on Rails 0% Complete
5. HTML5 and CSS3 0% Complete
6. Javascript and JQuery 0% Complete
7. Getting Hired as a Web Developer 0% Complete
Hours Spent Coding Today: 11
Total Hours Coding: 417
No comments:
Post a Comment