git pull their-confilcts

на svn делается 1. svn up (Enter):

Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options:

2. tc (Enter)
на git git pull -X theirs