made a change
made other changes
1
from master
after delete
try a conflict
try a conflict at master
after conflict
test rebase
Merge branch 'master' of https://github.com/manachynskyi/Test into new
tre push branch
merge master + new