Skip to content

Commit 5142330

Browse files
committed
fix(install): use fetch + reset --hard instead of pull --rebase to avoid unmerged conflicts
1 parent 0881ae4 commit 5142330

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ fi
5757
# Download / Update
5858
if [[ -d "$INSTALL_DIR/.git" ]]; then
5959
info "Updating macrift..."
60-
git -C "$INSTALL_DIR" pull --rebase --autostash --quiet
60+
git -C "$INSTALL_DIR" fetch --quiet
61+
git -C "$INSTALL_DIR" reset --hard origin/main --quiet
6162
ok "Updated"
6263
elif command -v git &>/dev/null; then
6364
[[ -d "$INSTALL_DIR" ]] && rm -rf "$INSTALL_DIR"

0 commit comments

Comments
 (0)