update b.txt by b
merge a
merge b
update master.txt by master
merge a, b.txt by a pushed data
update all files by master