Merge Countersign Understanding with airSlate SignNow

Merge countersign understanding

[Music] hello and welcome to this next lesson in our get essentials course in this video we want to have a look at two merging strategies the git merge commands already provide to us which are very handy in certain cases sometimes you already know that if you want to merge two branches that the content of one branch may override the contents of the other branch because the contents are newer or you provide some fixes and so on and so on and there's also the other way round that you know ok the contents in my branch are quite obsolete in some parts and the target branch has newer content then you want to have the contents of your target branch to overwrite the contents of your feature or hotfix branch or whatever and instead of resolving those conflicts that may occur manually you can let get take care about this and I already prepared a diverged situation inside of our demo repository I created now a hotfix branch containing some hot fixes and I have also the master branch having some other contents and we are on the master branch right now and you can see on the left side the content of the hotfix txt file that I have created and if I kit if I check out the hotfix branch you will see that the contents of this file are totally different and I just emulated so that the file may contain cool hot fixes to our project and I now want to merge this into the master branch and I want to override the content of the hot fixed or txt file in the master branch with my very own contents and this can easily be done by just running git merge master - X - X is a parameter to provide your merging strategy and now you can say ours so ours is our branch and the contents of our branch may override the contents of the target branch doing this will bring up instantly the vim editor to us because there are no conflicts to resolve and get now automatically wants to create the merge commit for us and it also provides a standard or default and commit message that we can use in this case I do not want to change it I just want to demonstrate the functionality of this command that's why I quit all the women that are here right away and now you have seen that there is some kind of automating is going on and if we now bring up the lock once more then now you can see that the merge commit has already been prepared and now we would be able to just make a fast-forward merge from master to the hotfix branch so this is the minus minus or minus X our strategy to override contents in the target branch with your very own content I now just reset it the situation in...