Merge eSigning Required with airSlate SignNow

Merge esigning understanding

hey what's got em gang welcome to your Nance get and ghetto tutorial and in this video we're going to start merging branches and dealing with conflicts okay then so in the last tutorial what we did is we created a couple of new branches to work on some new features and that's typically what we do if we're working on new features because we don't want to mess up the master branch which is going to be our production code so we made these new branches and we were happy with the new features so now we need a way to take that code and merge it back into the master branch and that's what we're going to take a look at in this tutorial merging these kind of feature branches and the code we create here back into the master branch so that when we publish our code we're publishing this new feature as well okay so I'm still in the same repo and what I'm going to do is just a git branch I can a to show us the branches you can see we've got three branches master feature a or future B and we're currently on master so let's just check out feature a and feature B to see what they have we'll say git checkout and then feature a and you can see we've got this script right now feature a okay so that's the first branch and the other branch git checkout feature B is going to be this feature B javascript file both very similar either way we've finished these two features now and we're happy with each one now I want you to imagine that each feature is being worked on by a different person at the same time so myself are working on feature B and happy with it now so what I want to do is merge it back into the master branch right so to do that first of all we have to be on the branch that we want to merge into so we want to be on the master branch because that's what we're merging into so I'm going to save get check out mustard okay now what we want to do is merge that feature a branch into this one and to do that we just say git merge and then the name of the branch that we want to merge in and it's called feature - a ok so now we see this message updating flash-forward feature a dot JavaScript one file changed one insertion okay so now what we've done is we've taken that collet from the branch the feature one branch off each a branch and we've merged it into this master branch which was still on and now we can see that feature a script right there so cool we've merged that now and this fast-forward thing basically means that all were doing is kind of fast-forwarding up to the cold...