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
Viewing Teammates Git Branches
The shortest way to see other’s branches is to go to GitHub and look at them there. If you’re working in a team and want to see other people’s branches in your local site in VS Code then here are a few Git commands for the terminal that can help. TL:DR Downloads all of the… Continue reading Viewing Teammates Git Branches
