Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: johannesjo/parallel-code
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.0
Choose a base ref
...
head repository: johannesjo/parallel-code
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.2.1
Choose a head ref
  • 7 commits
  • 15 files changed
  • 3 contributors

Commits on Mar 25, 2026

  1. 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>
    ASRagab and claude authored Mar 25, 2026
    Configuration menu
    Copy the full SHA
    2b82e88 View commit details
    Browse the repository at this point in the history
  2. 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.
    johannesjo committed Mar 25, 2026
    Configuration menu
    Copy the full SHA
    8d6e3cb View commit details
    Browse the repository at this point in the history
  3. 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
    johannesjo committed Mar 25, 2026
    Configuration menu
    Copy the full SHA
    cda05c3 View commit details
    Browse the repository at this point in the history
  4. 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.
    johannesjo committed Mar 25, 2026
    Configuration menu
    Copy the full SHA
    23ae2bb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c42b921 View commit details
    Browse the repository at this point in the history
  6. 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.
    johannesjo committed Mar 25, 2026
    Configuration menu
    Copy the full SHA
    0269812 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2026

  1. 1.2.1

    johannesjo committed Mar 26, 2026
    Configuration menu
    Copy the full SHA
    ab434ae View commit details
    Browse the repository at this point in the history
Loading