Here are some resources, tutorials and videos that answer questions or difficult areas you identified for the Final Project. Git Merge Conflicts Shorter Videos These videos don’t go into full detail like the videos in the next section. They try to quickly show a process. Git Merge Conflict Shorter [4:06] Git Merge Conflict Long [8:22]… Continue reading Final FAQ’s
Tag: git
Week 13: 5/2 + 5/4
Monday 5/2 Collaborating on Code We will look more into how to collaborate with Git and GitHub by learning about branching and how to add your teammates to a single repository. Learning to work with other people in Git and GitHub is a valuable skill. Branches are what make this possible. What we learn today… Continue reading Week 13: 5/2 + 5/4
Collaborate on GitHub
Here are some of the basics for collaborating on GitHub. Use a Single, Shared Repository One of the people in the group will create the repository that everyone will use. After the Repository is created then invite the other members to collaborate on that. DO NOT FORK THE REPOSITORY. We did that with mine and… Continue reading Collaborate on GitHub
Git Merge Conflicts
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
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
