Git fetch branch. Git хаотичный merge. rebase vs merge. rebase ii. git rebase.