Merge Signed Request with airSlate SignNow

Merge article

welcome to this video this video starts a bit different because as the title says we want to have a look at git rebase and git merge and see how these two commands work and how we can use them the problem is that these commands well can be applied in a lot of different situations and pros and cons and so on and actually i just wanted to give you a quick example how you could use both of these for that we'll have a look at our quick example project now in the intro and then continue with the actual code because in this video we'll start with the following situation we'll have a master branch right here with two commits m1 m2 master commit 1 master comma 2 doesn't matter a lot in the end how we name them the important thing is that this example project will also come with a feature branch this feature branch is created based on the master branch so based on this last commit in the master branch basically and we implemented some stuff in there so we are working on a new feature which shouldn't be implemented into our master branch immediately at the same time our master branch is also evolving our colleagues are working on it whatever the important thing is that we also got a new commit right here so the situation is this one we started at this second commit and now both branches evolved after that we want to continue with our feature branch and finish our feature well and then the question is how can we combine these developments the m3 commit so the latest commit in our master and the latest commit in our feature branch into or back into our master branch right here this thing right here well for that we have a lot of different approaches and in this video i want to show you two ways how to achieve this one way with git merge the other way with git rebase so that was some theory let's have a look at the code now right here i am in the project and if we have a look at git branch down here in the terminal in my integrated terminal you can see that we have exactly the same structure that we saw on the slide we have two branches master and feature and if i have a look at the commits in my master branch you can see that i have three commits the third one the second one and the first commit m1 let's now check out the other branch the feature branch right here like this and also see what's in there and as you can see we have f1 so the first commit in the feature branch and important this m2 commit right here which is the last commit both branches have in common the m2 commit we also have the m1 commit down there by...