You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit b6ea15f
Browse filesBrowse the repository at this point in the historyBrowse files
1. Untracked files no longer block Move-Commit — only modified tracked
files trigger the "uncommitted changes" error. Error now lists the
offending files. Untracked files produce a warning instead.
2. Source worktrees are force-removed on failure (not preserved), so
failed retries don't leave behind .gitsplit-worktrees/ that block
subsequent attempts.
3. Branch-exists error now suggests omitting -CreateDestinationBranch
to reuse the existing branch, or deleting it with git branch -D.
4. Rebase error messages now include conflicted file names and suggest
-RemoveConflictFiles for modify/delete conflicts.
5. Renamed -AutoResolveConflicts to -RemoveConflictFiles for clarity.
Fixes#20
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@@ -1136,7 +1143,8 @@ function New-MoveCommitPlan {
1136
1143
' }',
1137
1144
' }',
1138
1145
' if (-not $resolvedAny) {',
1139
-
' throw "git -C <source-worktree> rebase --onto failed: unable to auto-resolve (no modify/delete conflict on a file created by the moved commit)"',
1146
+
' $unresolvedFiles = $conflictFiles -join ", "',
1147
+
' throw "git rebase --onto failed: unable to auto-resolve. Conflict files not created by the moved commit: $unresolvedFiles. These conflicts require manual resolution."',
1140
1148
' }',
1141
1149
' }',
1142
1150
' if (-not $rebaseComplete) {',
@@ -1157,7 +1165,12 @@ function New-MoveCommitPlan {
1157
1165
$executionLines+=@(
1158
1166
( ''+$rebaseOntoLine.TrimStart()),
1159
1167
' if ($LASTEXITCODE -ne 0) {',
1160
-
' throw "git -C <source-worktree> rebase --onto failed while removing $commitHash from $expectedBranch"',
' throw "git rebase --onto failed while removing $commitHash from $expectedBranch. Conflicted files: $conflictList. Re-run with -RemoveConflictFiles to auto-resolve modify/delete conflicts on files created by the moved commit."',
1172
+
' }',
1173
+
' throw "git rebase --onto failed while removing $commitHash from $expectedBranch (exit code $LASTEXITCODE). Re-run with -RemoveConflictFiles to attempt automatic conflict resolution."',
0 commit comments