Right, let's have some examples and compare. Fast forward merge this three way merge example. And its first example demonstrates, as far as much code below creates new range, and a few columns and integrate this history into the main line fast forward. So we have a new feature branch created for myself. We added one time commit file so you can make comments again. Then we go into muscle bench, mesh muscles and feature and the little branches.
We don't get anymore. It looks pretty simple, right? And this is a common workflow for short periods of adventures. That Is it more or less the development process and organizational tool for longer run features as I told you before, and the nodes that get should not complain about in range manzi sense a new feature is now accessible from the master branch. And if you require a merge come and do the Fast Forward merge for record keeping purposes, you can execute get merge with minus minus no minus FF merger option. So, even if you have a fast forward option and you know about it, but you want to have a comment, you can add mesh.
This is what can this kind of notion is five branch into the Congress, but always Rate commercial. pretty useful, especially if you work in on the small features a lot of times. So to enlarge, rates a similar example. And we have a feature branch, we also made some changes and we made changes that will show us that password is not possible. And it will actually create a three way merge. So it's common scenario for large features, or when different developers working on the same project, for example, working together on the same feature, the same time.
So start a new feature branch from changes. When the time comes. This changes making changes again. This changes your view to master edits. Some files into master branch. And as this message comet changes and has this long initial message, then we want to merge process.
And it's not possible. This was hard because we made this change. So our friendships are moving. And it's a no brainer. So this good natural create a server merge and to have separated, gets mesh message. And then we deleted our new feature branch.
No, that's impossible forget to perform Fast Forward merge, where changes was made on second branch, let's call it second section. So no way to move muster up to the new future results. backtracking and multiple flows in the future would be a much larger feature. That took a long time to the law, which would be in the comments which appear on master at the same time. feature branch was as small as we have, as our previous example on the slide, you would probably prefer to use reason and just fast forward, move your changes into master by doing passport much. This prevents superfluous merge comments from cluttering opposite project history.
But again, if you ask my personal opinion, I'm okay with this. messages and I usually when I work, as part of the team I prefer to have ever seen as our project is it's pretty useful, especially when you work on a project for example, eight months or one year. Okay now for the slide