Skip to content

BranchDeck 1.0.0

Choose a tag to compare

@PanBronty PanBronty released this 25 Aug 18:13
· 3 commits to main since this release

BranchDeck 1.0.0

This release is about what the application says when you are not reading the code — and about
resolving a merge conflict without editing markers by hand.

  • Conflicts are resolved block by block. Instead of three whole-file panes and a text box, the
    resolver walks each conflict it finds, shows both sides beside each other, and lets you click the
    lines you want in the order they should appear. Use both changes and the whole-file shortcuts are
    still one click, and Reset puts back the file Git wrote.
  • The result tells you where every line came from — current, incoming, edited, or a marker still
    unresolved — and the stage button warns for as long as a marker is left.
  • Git's plumbing is out of the interface. A push reported To C:\...\remote e0a081a..8ceba90
    main -> main
    ; it now reports Pushed main to the remote. A commit printed create mode 100644
    notes.txt
    ; it now gives its short id and the number of files that moved.
  • Errors say what went wrong and what to do. Error invoking remote method 'git:action': Error:
    Command failed: git -C … --no-optional-locks push
    has been replaced by The remote could not be
    reached. Check the connection and that the repository still exists.
    Sixteen distinct failures each
    get their own sentence, and when a hook refuses a commit its own output is quoted, because that is
    the line telling you what to fix.
  • The raw output is still there. It moved to the activity log, where the View activity button
    next to every error already pointed.
  • Menu items explain why they are unavailable. Create pull request… now says Connect an Azure
    DevOps account that has this repository
    underneath itself, instead of being greyed out in silence.
  • Force delete tells you the cost. Force delete feature/login and one commit that exists nowhere
    else?
    , with the reflog named as the way back.
  • Text got easier to read. Four font sizes instead of nine, a 13px body, and every text in the
    default window at or above the WCAG AA contrast ratio.
  • Smaller things: the branch name no longer clips to ma… on a narrow window, commit dates use one
    language instead of two, new branch shows what it branches from, and Settings warns before it
    throws a draft away.