cambiando rebase a merge

DeybisMelendez · Sep 15, 2024 · 37495a7 · 37495a7
1 parent 34b73c8
commit 37495a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.devcontainer/autoupdate.sh b/.devcontainer/autoupdate.sh
@@ -2,6 +2,7 @@
 
 # Obtener y fusionar cambios del repositorio upstream
 GIT="git --git-dir=$PWD/.git --work-tree=$PWD"
+
 $GIT fetch origin
 $GIT rebase origin
 $GIT fetch upstream

diff --git a/.devcontainer/configuregit.sh b/.devcontainer/configuregit.sh
@@ -4,5 +4,6 @@
 SAFE_DIRECTORY="/workspaces/codespaces-uni"
 REPO="https://github.com/DeybisMelendez/codespaces-uni.git"
 
-git config --global --add safe.directory "$SAFE_DIRECTORY"
-git remote add upstream $REPO
+GIT="git --git-dir=$PWD/.git --work-tree=$PWD"
+$GIT config --global --add safe.directory "$SAFE_DIRECTORY"
+$GIT remote add upstream $REPO
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -42,5 +42,5 @@
         "files.autoSaveDelay": 3000,
         "files.autoSaveWhenNoErrors": true
     },
-    "postStartCommand": "sh .devcontainer/configuregit.sh && sh .devcontainer/autoupdate.sh"
+    "postAttachCommand": "sh .devcontainer/configuregit.sh && sh .devcontainer/autoupdate.sh"
 }