Welcome to the fourth lesson of Intro to Programming. This week is a little lighter due to the holiday. You will be expanding your knowledge of CSS for more complex styling. In this unit, we will:
- Learn additional CSS using Flexbox
- Review HTML
Lesson 4 Goals
- Introduction to Flexbox
- Further understanding of website development
- Further understanding of merging branches in github
Curriculum
Complete the following Treehouse lessons:
4.1 CSS Flexbot Layout (105 min)
Assignment
- Return to Assignment 2 and try to further build out your portfolio website, using your new knowledge of flexbox.
1. Keep your old repository from week 2.
2. Create a new branch off master/main called ‘week-4-site-update’ or something similar (this is similar to the concept of a feature branch) so: git checkout -b week-4-assignment
This allows you to keep your old work on master/main while you do your new assignment. Once you have all of the work that you want added on your new branch you can…
3. Merge your new branch back into master.
This can be done in a variety of ways. One way is to commit your changes on new branch, which you should be doing anyway: git add git commit -m 'describe your changes at a high level in message'.
4. Then, checkout your main branch git checkout master
then merge git merge week-4-assignment
5. From there you’d want to push your master branch back to your remote repository on github and it would be updated both locally and remotely.
Conversely you can do a pull request once your changes are done – this is how you would work in a team.
Once you’ve committed your changes and are done with your week-4-assignment branch, you put your work on the remote by doing:git push origin week-4-assignment
Then, inside of github you would make a Pull Request where master/main is the base branch an your week-4-assignment is the “compare” branch and merge them that way. Then you’d re pull your master/main branch after that was merged online and your local would be updated that way.
That’s it for this week! Remember to attend two mentor sessions this week and post your questions in Slack.
