@bobfrankston/npmglobalize 1.0.36 → 1.0.37

package/README.md

@@ -203,17 +203,24 @@ Publishing requires being on a branch so commits and tags can be properly tracke
    ```
    The files are already updated! You don't need to run it again.
 
-2. **Want to publish:**
+2. **Want to publish (have commits to keep):**
    ```bash
-   git checkout master      # Get back on a branch
+   git checkout -B master   # Moves master branch to current commit (merges)
    npmglobalize            # Now works normally
    ```
+   The `-B` flag moves your branch pointer to include the detached commits.
 
-3. **Force publish anyway (not recommended):**
+3. **Want to publish (no commits made, safe to discard):**
+   ```bash
+   git checkout master      # Just switch back to branch
+   npmglobalize            # Now works normally
+   ```
+
+4. **Force publish anyway (not recommended):**
    ```bash
    npmglobalize --force    # Proceeds despite detached HEAD
    ```
-   Warning: Commits may be hard to track later. Consider merging back to a branch afterward.
+   Warning: Commits may be hard to track later.
 
 ## Command Reference
 

package/lib.js

@@ -1293,10 +1293,13 @@ export async function globalize(cwd, options = {}) {
             console.log(colors.yellow('✓ Good news: Your files are already fixed!'));
             console.log(colors.yellow('  You don\'t need to run --conform again.'));
             console.log('');
-            console.log(colors.yellow('To publish, get back on a branch:'));
-            console.log('  git checkout master       \x1b[2m# or whatever your branch is\x1b[0m');
+            console.log(colors.yellow('To publish, merge back to your branch:'));
+            console.log('  git checkout -B master    \x1b[2m# moves master to current commit\x1b[0m');
             console.log('  npmglobalize              \x1b[2m# will now work normally\x1b[0m');
             console.log('');
+            console.log(colors.yellow('Or if you haven\'t made commits yet:'));
+            console.log('  git checkout master       \x1b[2m# just switch back\x1b[0m');
+            console.log('');
             return true; // Success - conform was completed
         }
         else if (noPublish) {
@@ -1312,11 +1315,15 @@ export async function globalize(cwd, options = {}) {
             console.log('  This happens after checking out a specific commit or tag.');
             console.log('  Publishing requires being on a branch so git can track changes.');
             console.log('');
-            console.log(colors.yellow('To fix this:'));
-            console.log('  git checkout master       \x1b[2m# or whatever your branch is\x1b[0m');
+            console.log(colors.yellow('To fix this (if you have commits to keep):'));
+            console.log('  git checkout -B master    \x1b[2m# moves master branch to current commit\x1b[0m');
+            console.log('  npmglobalize              \x1b[2m# will now work\x1b[0m');
+            console.log('');
+            console.log(colors.yellow('Or if you haven\'t made commits (safe to discard):'));
+            console.log('  git checkout master       \x1b[2m# just switch back to branch\x1b[0m');
             console.log('  npmglobalize              \x1b[2m# will now work\x1b[0m');
             console.log('');
-            console.log(colors.yellow('Or to force publish anyway (risky):'));
+            console.log(colors.yellow('Or force publish anyway (risky):'));
             console.log('  npmglobalize --force      \x1b[2m# proceeds despite detached HEAD\x1b[0m');
             console.log('');
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",