version control

File-specific merge resolution in git