git commit -a -m
merge files
merge files