Пример коммита в ветку educational
commit N2
new branch!
Merge branch 'origin/branch_1'

Conflicts:
	testfile.txt
commit into new_branch
Update newfile.txt
commit
Update newfile.txt

commit
commit
commit
commit
Merge branch 'new_branch'
byGoko

Проект с Maven