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 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
Getting Started
This post outlines the steps to take to get a basic web site project ready to do. These are the things you do BEFORE you start writing HTML and CSS. You should also do these AFTER you have created a project brief with a sitemap and wireframes so you know what you’re going to make.… Continue reading Getting Started
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
