Merge Byline Answer with airSlate SignNow

Merge resolution

(ringing bell) - Hello, surprise. It's a video about Git and GitHub, and this video is about resolving merge conflicts. So, I probably should be doing this video in my poem repository, which I use for all of my intro to Git and GitHub videos but I happen to be here, streaming live, and working on this neural network library that I've been building in a bunch of other video tutorials. So, if you just watched those Git and GitHub videos all about using a poem to sort of demonstrate how Git and GitHub works, there'll be some aspects of this that are confusing, but hopefully this will be helpful anyway. I can always double back and make another video if this one doesn't work but let's just try it. So, what is a merge conflict, first of all? So, a merge conflict is when you have, let's say this is a file. In this case, it's my file called matrix.js. So, I have a file called matrix.js and it has code in it. Now, I had two people, two separate people of the internet happen to be working on this file. So, we'll call one person A and one person B. Now, any text file has lines in it. So, even if it were a poem, it would have lines of the poem. If it's source code file, it has lines of the source code. So, we can think of the lines as like one, two, three, four, five, six. Now, if person A makes a change and submits a pull request, meaning hey, hey. You, the library, please pull my changes, right? I want to push my changes to you but I'm asking, requesting that you pull my changes. If this person just made changes to lines five and six, and this person is doing the same thing but made changes to lines two and three, the Git system is smart enough to figure out how to pull both of these things in with no conflicts because there are no conflicts. If I want to accept changes to lines two and three, I can accept those at the same time, one before the other, simultaneously, can't really do it simultaneously as lines five and six. However, if right here person B makes a change to line four and person A also makes a change to line four, then we have what's known as a conflict, and typically what will happen, and what just happened to me right now is I merged this one, I merged this one. Wasn't thinking about it. I was done, it's finished, and it worked fine. It merged with no problems but now, when I went to merge this one, I got a message saying resolve conflicts. Now, there are a variety of ways you can resolve conflicts and I think that I've, in some of my previous tutorials, looked at working with Git command-line locally and I can have the text file, there...