master 5
master add 6
master 7
myBranch 3

myBranch 1

myBranch 3

Merge branch 'myBranch1' of github.com:redarc/GitTest into myBranch1

Conflicts:
	mycommit.txt

myBranch 4

myBranch 5

myBranch 6
Merge branch 'myBranch1' of github.com:redarc/GitTest into myBranch1