Merge branch 'hotfix/v5.38.X'

Author: tomgrv

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 # Changelog
 
+## 5.38.7 (2026-03-24)
+
+_Commits from: v5.38.6..HEAD_
+
+### 📦 gitutils changes
+
+#### Bug Fixes
+
+- 🐛 add dependency for gitversion feature ([1d5aae7](https://github.com/tomgrv/devcontainer-features/commit/1d5aae7e3e6b8a4dc6b66cda40958c8937565a3b))
+- 🐛 update reset logic to use checkout before hard reset ([9261c63](https://github.com/tomgrv/devcontainer-features/commit/9261c638d4f96f408189b258c75ae609a670a409))
+
 ## 5.38.6 (2026-03-24)
 
 _Commits from: v5.38.5..HEAD_

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/devcontainer-features",
-    "version": "5.38.6",
+    "version": "5.38.7",
     "description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
     "keywords": [
         "dev",

package.json

@@ -136,24 +136,14 @@ if [ $failed -eq 1 ]; then
 	exit 1
 fi
 
-# Reset source branch to source base
-zz_log i "Resetting '$source' to source base"
-if ! git reset --hard $source; then
-	zz_log e "Failed to reset '$source' branch"
-	exit 1
-fi
-
 # Fast-forward target branch
 zz_log i "Fast-forwarding '$target' branch"
 if ! git checkout "$target"; then
 	zz_log e "Failed to checkout '$target' branch"
 	exit 1
-elif [ -n "$push" ]; then
-	zz_log i "Pushing changes to remote"
-	if ! git push origin "$target"; then
-		zz_log e "Failed to push '$target' branch to remote"
-		exit 1
-	fi
+elif [ -n "$push" ] &&! git push origin "$target"; then
+	zz_log e "Failed to push '$target' branch to remote"
+	exit 1
 fi
 
 if ! git merge --ff-only "$temp"; then
@@ -167,5 +157,22 @@ else
 	git branch -D "$temp"
 fi
 
+# Reset source branch to source base
+zz_log i "Resetting '$source' to source base"
+if ! git checkout "$source"; then
+	zz_log e "Failed to checkout '$source' branch"
+	exit 1
+elif ! git reset --hard "$base"; then
+	zz_log e "Failed to reset '$source' branch"
+	exit 1
+fi
+
+# Go back to original branch
+zz_log i "Switching back to original branch '$current'"
+if ! git checkout "$current"; then
+	zz_log e "Failed to checkout original branch '$current'"	
+	exit 1
+fi
+
 # Log success message
 zz_log i "Successfully moved commits from '$source' to '$target'"

src/gitutils/_git-fix-base.sh

@@ -2,12 +2,13 @@
     "id": "gitutils",
     "name": "Git Aliases",
     "description": "A feature to add useful Git aliases to your shell.",
-    "version": "5.38.6",
+    "version": "5.38.7",
     "dependsOn": {
         "ghcr.io/devcontainers/features/node:1": "lts",
         "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {
             "utils": "jq dos2unix git-flow"
-        }
+        },
+        "ghcr.io/tomgrv/devcontainer-features/gitversion:5": {}
     },
     "installsAfter": [
         "ghcr.io/tomgrv/devcontainer-features/common-utils",

src/gitutils/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/gitutils",
-    "version": "5.38.6",
+    "version": "5.38.7",
     "description": "Git utilities and aliases for development workflow",
     "files": [
         "_*.sh",