When you’re doing a Git Merge, sometimes you have made changes to the same line of code that someone else also changed. When you try to merge your files you will get an error message that will look something like this: When this happens, Git will create a special version of the files that had… Continue reading Git Merge Conflicts
Category: Tools
Git Cherry Pick
Cherry picking in git is a relatively advance way to bring in the code from a single commit into your current working branch. Why might you want to do this? Well, a good example in our class is that I forgot to add some code to the .eleventy.js file in the eleventy-basic repository template I… Continue reading Git Cherry Pick
Git Credentials
When you’re working with Git and doing things like making commits, Git tracks who it is that made the commit. In order to do that Git needs to know your username and email. If you haven’t set that up you will see an error when you try to make a commit. Something like this in… Continue reading Git Credentials
Git and GitHub
Basics Dan Schiffman’s Coding Train Git and GitHub Introduction Video. He does this all on GitHub and focuses on concepts over code. Git Workflow Miro Board This board is a visualization of how git works and the daily workflow. https://miro.com/app/board/o9J_lOnEtSE=/?invite_link_id=959586073517 Branching When working on group projects you should use a branching workflow. Working with Branches… Continue reading Git and GitHub
Week 15: 12/6 + 12/8
Live Sessions JOIN LIVE SESSION After Class: Work on Group Projects.
VSCode 11ty Setup
When we’re working with Eleventy there are some new file types that VS Code will not handle as you expect. Follow these steps to set up VS Code to work with them. Nunjucks This is the templating language we will use (11ty actually lets you use a number of them). Install the Nunjucks extension to… Continue reading VSCode 11ty Setup
Visual Studio Code Extensions
Extensions allow you to add functionality to VS Code. Learning how to work with them will help you to work faster and more efficiently and sometimes better understand your files and see mistakes that you’ve made. How to Add Extensions VIEWING INFORMATION These change the VS Code interface to add color coding, information about things… Continue reading Visual Studio Code Extensions
