add master.txt
edit master
Merge all b2's change to master; wq
Merge branch 'b2'
edit master.txt in master branch
Pick  main branch 'master''s change into b2 and continue dev in b2.