agregado upstream otra vez (borrado por accidente)

DeybisMelendez · Sep 25, 2024 · d607fa5 · d607fa5
1 parent 4b2df53
commit d607fa5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.devcontainer/update.sh b/.devcontainer/update.sh
@@ -15,9 +15,13 @@ if echo "$GIT_OUTPUT" | grep -q "is owned by"; then
     echo "Agregando directorio inseguro como seguro: $UNSAFE_DIR"
     $GIT config --global --add safe.directory "$UNSAFE_DIR"
 fi
-
+# Verificar si upstream ya existe, si no, agregarlo
+if ! $GIT remote | grep -q upstream; then
+    echo "Agregando remoto 'upstream': $REPO"
+    $GIT remote add upstream $REPO
+fi
 # Obtener y fusionar cambios del repositorio upstream
 $GIT fetch upstream
 COMMIT=$(date +"%Y-%m-%d %H:%M:%S")
-$GIT merge upstream/main -m "$COMMIT"
+$GIT merge upstream/main -m "$COMMIT" --allow-unrelated-histories
 $GIT push