Let's talk more about merging. Using say we have a new branch feature set to base it on master branch. And we now want to merge this feature branch into master working this good mesh count will merge the specified range into the current branch as we assuming master and get your determines the mesh algorithm automatically. We discuss this below like different ways sickness that nurtures Yes, much comments are unique against other candidates, the fact that they have to find comments. As in get all this to win creates an image cognitively to attempt to automatically merge two separate the teasers into one history. encounters piece of data That's change it in both sisters and it's not able to automatically merge them.

It will create version control conflict and Gil gets will needs your personal inputs in order to fix this issue is called inertia conference. So, preparing to match how to do before performance and merge, there are a few important preparation steps that you need to do before you do merge and if your goals but a little bit step back. When you log in gifts, sometimes you might find tips to add a reference to the last comments is a currently checkout range. So you can sync all the head as the carnage And when you switch branches with the checkout, the head to region changes to the point of the tip on the new checkout branch. So it's while when you change your branch, for example, it is changing their place too. So it's always good to be on the top of your history of branch committees.

So it's like this. For example, if you go back, it will be the same place. So by Rowan's, for example, step backs, that's what the change is like. Okay, confirming the resume badge into security status in order to ensure that at this point in to the correct motion or soon bridge If needed, for example, if you work on feature branch and then you work, then you want to merge your changes into master before in it, execute the check out and jump into master in order to be able to run. In our cases, we usually execute each master because we usually imagine only to master or in our examples, which latest smartphones, for example, some you put your coat on line on top, and some changes was made on this server side remote repository. It can be someone else with some changes, or for example, you yourself go to github.com and upload files we upload or make some changes.

We are They are editor so how you can fetch that remote comments you need to want to get fetch comment it will grab all changes in history to local machine ends then you can run get tools that will grab all comments remote repository has and put into your local machine and after run get fresh and cool you'll be able to know that your local machine is safe even to your get your multi sir. Okay. actually mentioned process. So before we talk about preparing to merge, and right now you can start emergent process by executing get nervous Name, where is the name of the branch that will merge it into their assumed branch. So in our case, we have a feature branch feature a, when it's around, get merge. And get knowledge can be enhanced in two ways.

It's fast forward merge, and through emerge. We'll talk before about in bytes, we'll go again, what's worked as far as merge can occur when there are linear costs from the current branch to the document, instead of actually merging two branches. All it was about to do. It's just different histories like fast forward. So the current branch will be moved up to the target branch. And this will affect you the combines to history science since all the comments Both from starting branch and now label who is the current one for example, password match some feature into muscle would look something like this.

So, as for much, you have my siblings and you have feature branch with some cons before merger and after merger tip of the master hat as the master will be more here and this Office Word we cannot be able to access most tips have both branches and we need to create separate commits that will combine boss changes and move that tip master is at this point. But as for merge is not possible if branches are there. When there is not a lot of you cannot actually make a linear path to start the branch. It has no choice but combined changes from most of us most branches into one convert and do it in three way merge to emerge, use the duplicate from it to tie to the other two sisters. And that mental tool comes from the fact that it uses three comments in order to generate the most common so it's actually connect three comments like one from one branch, second from second branch at Salt Lake.

It's actually a good measurement. While you can use either of these merge stretches, many developers like to merge. It's usually doing we are busy For most cases, when you have small changes, small features or bug fixes, it's pretty good way to do that again. Sometimes you need to be very careful about passwords, as well because it's used through basic and while receiving through virtuals integration. When you work in more time on some features, for example, you have a separate branch when you called, for example, weeks or months, there and through and merge is a better way to move your changes from your separate branch into Samson. Important branches like Master, for example.

The ledger case results in merge commit serves us symbolic joining us to branch or to merge it some offers a slight c