Commit changes in Master
Changes in master Testclass
Commit
Commit changes
New Java file HelloWorld6
Comiting TestChild Changes
Merge branch 'master' into testChild
Changes committed in testChild
Main Branch commit after merge
File commit done in Master
Commit by testChild
Commit in Master
In Master
Merge branch 'master' into testChild

Conflicts:
	EGITJavaProject/bin/HelloWorld.class
	EGITJavaProject/src/HelloWorld.java

	After Merge
TestChild
Commit in master
Changes merged in testChild
Merge branch 'testChild'

Conflicts:
	EGITJavaProject/bin/HelloWorld.class
Merge remote-tracking branch 'EGITRepo/master'

Conflicts:
	EGITJavaProject/src/HelloWorld.java