FAO ADAM - FIX THIS MESS Auto resolve merge conflicts - current first

auto-resolve-git-conflict.txt

while ! git rebase --continue; do
    git diff --name-only --diff-filter=U | while read file; do
        # Apply 'ours' (current changes from HEAD) first
        git checkout --ours "$file"
        
        # Then apply 'theirs' (incoming changes)
        git checkout --theirs "$file"
        

        git add "$file"
    done
    git rebase --continue
done