[CI-SKIP] Ignore gitignore when adding files in automation

Continuation of #5387

Fixes #5456

scripts/upstreamMerge.sh

@@ -16,7 +16,7 @@ function update {
     $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master
     refRemote=$(git rev-parse HEAD)
     cd ../
-    $gitcmd add $1 -f
+    $gitcmd add --force $1
     refHEAD=$(getRef HEAD "$workdir/$1")
     echo "$1 $refHEAD - $refRemote"
     if [ "$refHEAD" != "$refRemote" ]; then