master commit
commit1 on branch
commit2 on branch
commit2 on branch
readme on master
Merge branch 'greet_laposhko'
commit for conflict from master
commit from conflict branch
commit from newConflictBranch
commit from master
conflict is OK
Commit from conflict branch1
commit from master
everything is OK
commit from master for rebase
commit from rebaseBranch
Merge branch 'master' of github.com:recper/Pr_pr_Lap4