git merge branch with theirs/ours

PHOTO EMBED

Fri Nov 03 2023 13:47:17 GMT+0000 (Coordinated Universal Time)

Saved by @vs #bash

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

git add .
git commit -m "Merged using 'theirs' strategy"
content_copyCOPY