test commit from source tree
test commit after set config
commit after set config in source tree
modify A_master, B_branch
change a_master
resolve conflict