push
addfiles
resolved conflics
modify ignore
modify