Sync with upstream

git_sync_upstream.sh

#!/bin/bash

UPSTREAM_SOURCE="https://github.com/XXXXXXXXX/XXXXXXXXXX.git"
KEEP_THIS="path/to/file/or/dir"

# Check if upstream remote is defined
if ! git remote -v | grep -q upstream; then
    git remote add upstream ${UPSTREAM_SOURCE}
    echo "Successfully added 'upstream' to remotes: ${UPSTREAM_SOURCE}"
fi

echo "Staging and committing any local changes ..."
git add .
git commit "Current changes and updates"

echo "Pulling any origin remote changes while keeping incoming remote changes ..."
git config pull.rebase false
git pull
git checkout --their .

echo "Merging upstream remote changes ..."
git fetch
git merge upstream/master

echo "If conflict, accepting my current changes for ${KEEP_THIS} ..."
git checkout --ours ${KEEP_THIS}
git commit -am "Merged upstream"

echo "Pushing all local to origin remote ..."
git push

echo "DONE!"