one commit under master
newer branch change
merge from newer_branch
835 on newerbranch
finished merge
commit in master 840p
rebase in new_branch
commit 841 in new_branch
rebase
new branch 842 in new_branch
rebase
another commit on new_branch
concluding merge
Merge remote-tracking branch 'refs/remotes/origin/new_branch' into new_branch

Conflicts:
	README.md