Thomas
Commit 1
Commit3
Commit4
Commit5
Commit6
2Commit1
2Commit2
2Commit3
2Commit4
Merge branch 'feature/SW-001'

Conflicts:
	ShowcasesFile.txt
	ShowcasesFile.txt~
rebase commit1
rebase commit 2
rebase commit3
2rebase commit1
2rebase commit2
2rebase commit3
2rebase commit4
rebase commit4e enter the commit message for your changes. Lines starting
rebase commit5