first commit on branch idea2
on branch idea2 merged with master
commit from idea3
still on branch idea2
Merge branch 'origin/idea2(idea3)' into idea2

Conflicts:
	file.txt
Merge branch 'master' into idea2
new improvement on idea2
new improvement on idea2
Merge remote-tracking branch 'origin/idea2' into idea2