Git merge branch. Git merge squash. git merge branch to master. git pull. git хаотичный merge.