Okay, at this video we'll talk about how to solve that conflict. Why it changes from one branch to another. So that branches you are trying to mesh them. Each mesh has some changes made on the same parts, the same file to be able to figure out. Usually it's more tricky, for example or mesh. And the developer, for example, you have one file where you have some methods which relate to a project you're working on Sample sets, place a data file and someone else decides that this method is not very useful as he just deleted and put on the same spot.

Another method might be better. And we actually like change in the same file on the same line. And there are a lot of methods of how to prevent this kind of issues. For example, you can have where it's simple files where you have two methods instead of long file. But again, sometimes these problems are created and you need to figure out how to solve them. And when such sedation saturation of course, it's a joke.

14 Years before the match, and it's like your inability to solve this complex manually before actually broken code to go into it. So it's pretty useful and use make some changes on the file, he sees this comment and one of the greatest things of getting in process that the to the familiar aided stage comment for petrol or soul conscious soul so not very unusual. When you encounter mesh commits, you can run get status commands, and it will show you which files need to be solved. And for example, like we have the branches branches have bugs branches have same file and the change in code, the same last verses file and you fly message to that branch master mustard, we have some medicines and modified files. So you should now understand you should have a big project with a lot of files you will be able to understand which files are actually creating confidence.

The confidence can be pretty key there because if you push some changes via flow live for quests, and it will show you which files have conflicts inside you'll be able to there's so many Okay, so how conflicts are presented. When he encounters conflict during image. He will edit file. And we'll show you by visual indicators how file looks on both versions in the same file in the same place. So it's not plain defendable, but when you generate the mesh content, you will actually see how how the file changes. So we can delete this.

Yeah, this is one line, this is another line. This is third line that will display a place at a file, way path. It's pretty helpful to search because you can like console was half as bad Sometimes this month just to be able to catch plays pretty quickly. Where actually comes in, sometimes you cannot resolve conflicts because, for example, if you have two branches and each branch you help file life is author generated blog. For example, He says that if you put some useful information into a log file and when you're trying to merge both branches, you will not be able to merge two different blocks. And he actually doesn't do this because he walks separate the team.

So it's better for example, if you can, those kind of problems, you made it as your lock file, ignore. So the pieces will skip changes on this file because they will not be able to to merge conflicts, especially when it walks from different environments or different versions. So, here we count example of how my file is formatted by get merge is. So I had some numbers here, so you need to subset it better. So on the first line, detailed content that's not affected by mesh components. And we have power.

Lead gen monitor your choices. It is from branch Master, and second line. It's conflicts that have as much to change. Then we have another separator, and it's also a second one. This causes conflict. You can see it says From feature branch and it this is aligned that completely.

So you may need to pick a lot of this lives and make some changes to your bolt in order to solve the conflict. And for sure Marcus, notice, like usually the content before this market is very soon branch and the first author is the merchant page. And once you have defined sections, you can go and fix it. And when you read it to finish your merge, you need to save your file and add it to your staging environment and then commit them to your studio. So when you did this mesh complete and committed people know that Complete the file actually not completed. And you need to know that sometimes it's okay to have mesh conflicts and all that will appear on the if you have to re emerge this password nurse would invoke because this has forwards your sister should be on the same on the same digital line and if you have a make that urgent between the branches fast forward just to see if it's enough of this video and in the next video we'll talk more about actually generate so much coming and generate so much