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: merge conflict
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
