Configure merge options for a particular remote repository in git?...

Git Merge - Binary File Conflict Resolution...

Solve git file conflict using SmartGit: ours vs theirs...

What happens if I pull a change on a file earlier set assume-unchanged in Git?...