how to merge with GitHub version conflict?
from SmartGit
commit and try to push
try 2
changed message string

how git will be merged changed strings from different submits?
reset repo dir
remove include
tracked branch "origin"
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorldExample/pr/testmain.java
moved to new package com.agn.hello
moved to new package com.agn.hello
?? strange commmit
how to merge with GitHub version conflict?
from SmartGit
commit and try to push
try 2
new feature file.txt from feature branch
Merge branch 'preMaster' into hhh

Conflicts:
	HelloWorldExample/pr/.idea/vcs.xml
	HelloWorldExample/pr/.idea/workspace.xml
	HelloWorldExample/pr/out/production/pr/.idea/uiDesigner.xml
	HelloWorldExample/pr/testmain.java
Merge branch 'hhh' into lostHeadBranch

Conflicts:
	HelloWorldExample/pr/.idea/vcs.xml
	HelloWorldExample/pr/testmain.java