accept incoming changes only where they conflict [theirs-conflict] code example Example: git take ours git pull -X theirs