-
-
Notifications
You must be signed in to change notification settings - Fork 78
Comparing changes
Open a pull request
base repository: johannesjo/parallel-code
base: v1.2.0
head repository: johannesjo/parallel-code
compare: v1.2.1
- 7 commits
- 15 files changed
- 3 contributors
Commits on Mar 25, 2026
-
fix: branch dropdown, diff base branch, and direct mode auto-checkout (…
…#34) * fix: branch dropdown, diff base branch, and direct mode auto-checkout Three bug fixes for the task creation and diff review workflows: 1. Branch dropdown: merge two racing SolidJS createEffect blocks into one effect with loading spinner and retry+toast error handling (DROP-01, DROP-02) 2. Diff base branch: normalize empty-string baseBranch to undefined at the IPC boundary (register.ts), task creation (tasks.ts), and legacy state load (persistence.ts) so diffs use the correct per-task base branch instead of silently falling back to main (DIFF-01, DIFF-02, DIFF-03) 3. Direct mode auto-checkout: replace "Please checkout X first" warning with automatic git checkout when creating a Direct mode task on a non-current branch (CHECKOUT-01) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * adding checkout branch --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Configuration menu - View commit details
-
Copy full SHA for 2b82e88 - Browse repository at this point
Copy the full SHA 2b82e88View commit details -
fix(git): fall back to HEAD instead of branch name when merge-base fails
When detectMergeBase could not compute a merge-base for any ref, it returned the branch name (e.g. "main"). This caused git diff to compare against main's current tip rather than the fork point, making every file changed on main appear in the task's Changed Files panel. Return headRef instead so the diff is HEAD vs HEAD (empty, safe default) and skip caching the fallback to allow retrying on the next call.
Configuration menu - View commit details
-
Copy full SHA for 8d6e3cb - Browse repository at this point
Copy the full SHA 8d6e3cbView commit details -
Merge branch 'task/if-master-branch-has-commits-not-in-the-0c4159'
* task/if-master-branch-has-commits-not-in-the-0c4159: fix(git): fall back to HEAD instead of branch name when merge-base fails
Configuration menu - View commit details
-
Copy full SHA for cda05c3 - Browse repository at this point
Copy the full SHA cda05c3View commit details -
fix(merge): detect branch mismatch before merging to prevent silent d…
…ata loss When an AI agent checks out a different branch in a worktree, the merge dialog would silently merge the stale original branch, discarding work. Now detects mismatches (wrong branch or detached HEAD) and blocks the merge with an actionable "Use current branch" button to realign the task.
Configuration menu - View commit details
-
Copy full SHA for 23ae2bb - Browse repository at this point
Copy the full SHA 23ae2bbView commit details -
Configuration menu - View commit details
-
Copy full SHA for c42b921 - Browse repository at this point
Copy the full SHA c42b921View commit details -
fix(git): use main-tip diff for one-way changed files view
Diff changed files against main's current tip instead of the merge-base, filtered to only files the feature branch touched. This eliminates "phantom" files that both branches changed identically and shows only what would actually change in main when merged. When main hasn't moved ahead (common case), behavior is unchanged.
Configuration menu - View commit details
-
Copy full SHA for 0269812 - Browse repository at this point
Copy the full SHA 0269812View commit details
Commits on Mar 26, 2026
-
Configuration menu - View commit details
-
Copy full SHA for ab434ae - Browse repository at this point
Copy the full SHA ab434aeView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff v1.2.0...v1.2.1