sync-worktrees 1.7.5 → 2.0.0

package/README.md

@@ -121,10 +121,10 @@ sync-worktrees --config ./sync-worktrees.config.js --list
 
 ## Configuration File
 
-For managing multiple repositories, create a JavaScript config file:
+For managing multiple repositories, create a JavaScript ES module config file:
 
 ```javascript
-module.exports = {
+export default {
   // Optional defaults for all repositories
   defaults: {
     cronSchedule: "0 * * * *",  // Hourly
@@ -132,7 +132,7 @@ module.exports = {
     branchMaxAge: "30d",  // Only sync branches active in last 30 days
     updateExistingWorktrees: true  // Auto-update worktrees that are behind (default: true)
   },
-  
+
   // Retry configuration (optional - these are the defaults)
   retry: {
     maxAttempts: 'unlimited',  // or a number like 5
@@ -140,7 +140,7 @@ module.exports = {
     maxDelayMs: 600000,        // Max 10 minutes between retries
     backoffMultiplier: 2       // Double the delay each time
   },
-  
+
   repositories: [
     {
       name: "frontend",  // Unique identifier
@@ -252,7 +252,12 @@ sync-worktrees intelligently handles branches that have been rebased or force-pu
    - Automatically resets the worktree to match the upstream
    - No data loss since the content is the same
 
-2. **Diverged branches** - When a branch has different content after rebase/force-push:
+2. **Diverged branches with NO local changes** - When someone force-pushes but you haven't made local commits:
+   - Automatically resets to the new upstream state
+   - No move to `.diverged` since you have no work to preserve
+   - Keeps `.diverged` clean by only preserving actual user work
+
+3. **Diverged branches WITH local changes** - When a branch has different content AND you've made local commits:
    - Moves the worktree to `.diverged` directory within your worktrees folder
    - Preserves all your local changes and commits
    - Creates a fresh worktree from the upstream branch