in local "remote_branch"
local "remote_branche" before pushing remote
Merge branch 'remote_branch' into test_new_branch

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