Preview:
# select upstream changes
git checkout --theirs .
# select local changes
git checkout --ours .

git add .
git commit -m "Merged using 'theirs' strategy"
downloadDownload PNG downloadDownload JPEG downloadDownload SVG

Tip: You can change the style, width & colours of the snippet with the inspect tool before clicking Download!

Click to optimize width for Twitter