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
Publish with GitHub Pages
Actually putting your site on the web where anyone can see it is called publishing your site. This post describes how to publish a site using GitHub Pages. Pages are a free feature of public GitHub repositories and a great way to host a basic site. Free web hosting through GitHub! 1. Click on the Settings… Continue reading Publish with GitHub Pages
