in local master
in local "remote_branch"
local master before push to remote
local "remote_branche" before pushing remote
Merge branch 'test_new_branch'

Conflicts:
	main/src/java/com/test/SomeClass.java
Merge branch 'remote_branch' into test_new_branch

Conflicts:
	main/src/java/com/test/SomeClass.java
Merge branch 'master' into test_new_branch
Merge branch 'remote_branch' into test_new_branch

Conflicts:
	main/src/java/com/test/SomeClass.java