git-rebase-then-merge/master_file