new file in local + new edit on local
edit on local
 merge local and server using cherry-pick
change on local