Merge branch 'hotfix/v5.38.X'

Author: tomgrv

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 # Changelog
 
+## 5.38.4 (2026-03-22)
+
+_Commits from: v5.38.3..HEAD_
+
+### 📦 gitutils changes
+
+#### Bug Fixes
+
+- 🐛 ensure develop branch is up-to-date before finishing release ([14a10d8](https://github.com/tomgrv/devcontainer-features/commit/14a10d826dd90dafec83e6351f1027e7dfc3331d))
+- 🐛 fix rebase ([a71f997](https://github.com/tomgrv/devcontainer-features/commit/a71f997a7297f1700df3be854e8ba9658416f1a3))
+
 ## 5.38.3 (2026-03-21)
 
 _Commits from: v5.38.2..HEAD_
@@ -531,4 +542,4 @@ _Commits from: v5.25.0..HEAD_
 
 ---
 
-_Generated on 2026-03-21 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_
+_Generated on 2026-03-22 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_

package-lock.json

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

package.json

@@ -6,7 +6,7 @@ eval $(
 		    p -      push     force push changes to remote
 		    d -      dryrun   show what would be done without making changes
 		    - target target    target branch to rebase commits onto
-			- source source    source branch to take commits from (default: current branch)
+		    - source source    source branch to take commits from (default: current branch)
 	help
 )
 

src/gitutils/_git-fix-base.sh

@@ -49,16 +49,15 @@ fi
 #### PREVENT GIT EDITOR PROMPT
 GIT_EDITOR=:
 
-current=$(echo "$main" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.X/')
+hotfix=$(echo "$main" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.X/')
 
 #### START HOTFIX
-git flow hotfix start $current
+git flow hotfix start $hotfix
 
 #### RESTORE STATUS AND HANDLE REBASE
 if [ -n "$rebase" ]; then
 
-    zz_log i "Rebasing: inverting develop and hotfix branches..."
-
-    git fix base hotfix/$current develop
+    zz_log i "Rebasing develop commits onto hotfix branch..."
+    git fix base -p hotfix/$hotfix
 fi
 

src/gitutils/_git-release-hotfix.sh

@@ -82,6 +82,17 @@ if bump-changelog -f $GBV -b -m; then
         zz_log s "Version & CHANGELOG committed and pushed"
     fi
 
+    # Ensure develop  branch is up-to-date before finishing release
+    if ! git fetch origin develop:develop; then
+        zz_log e "Cannot fetch develop branch from remote"
+        exit 1
+    fi
+
+    if ! git merge-base --is-ancestor $(git rev-parse develop) $(git rev-parse origin/develop) ; then
+        zz_log e "Develop branch is not up-to-date with remote. Please pull the latest changes."
+        exit 1
+    fi
+
     if git flow $flow finish $name --push --tagname $GBV --message $GBV ; then
         zz_log s "Release finished: {B $GBV}"
         rm -f .git/RELEASE

src/gitutils/_git-release-prod.sh

@@ -2,7 +2,7 @@
   "id": "gitutils",
   "name": "Git Aliases",
   "description": "A feature to add useful Git aliases to your shell.",
-  "version": "5.38.3",
+  "version": "5.38.4",
   "dependsOn": {
     "ghcr.io/devcontainers/features/node:1": "lts",
     "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {

src/gitutils/devcontainer-feature.json

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