Skip to content

v0.42.0-beta.2

Pre-release
Pre-release

Choose a tag to compare

@github-actions github-actions released this 22 Nov 19:08
· 1 commit to main since this release
e54d3b3

This pre-release puts the new conflict resolver in your hands. It's built on one rule: Gnosis merges a conflict for you only when it can prove the result. Anything it can't prove waits for you, and nothing is pushed until you push.

Resolve conflicts

How conflicts are sorted. Gnosis runs structural merge and its own rules on every conflict, then sorts each one into a bucket:

Bucket What it means
Merged Proven by the checks
Check There's a proposal, but you choose
Decide No safe proposal

Check proposals are never written into your merge until you choose Use the proposal, Keep or Edit. (#444, #459, #463, #476, #506)

The Conflicts view opens as a tab inside the PR. It uses the same diff as Changes, and it can compare the result with the PR, with main, or with both. (#474, #478, #484)

Editing a conflict. Edit a conflict in place. Only that conflict's lines change, and your edit is saved with the draft. (#500)

Lines Gnosis wrote. Lines neither side had are marked everywhere, including in the push confirmation. (#493)

New rules, each checked before anything is called Merged:

  • One side only reformatted the code.
  • Both sides made the same change. (#467)
  • Both sides added different definitions at the same place.
  • One side moved a function and the other side edited it. This always goes to Check. (#483)

Ask the model about a conflict. Gnosis asks about one conflict at a time, only when you click. The model's proposals always land in Check. Files and conflicts that look like they contain secrets are never sent. (#495)

Background preparation. For PRs you wrote or starred, Gnosis prepares the resolution in the background. The PR header shows how many conflicts need you. (#465)

The push confirmation has three groups: You decided, Merged for you, and Arriving from main. (#489)

Stacks:

  • A plan shows which PR to resolve first. (#466)
  • Restacks run the same pipeline. (#492, #501)
  • Before your first push, a preview shows what happens to the PRs above. (#494)

Opt-in features, off by default:

  • Undo after push, per repository. (#497)
  • A TypeScript type check of the merge, per linked clone. A new type error moves the conflicts to Check. (#498, #505)

The keyboard map:

Key What it does
J and K Move between conflicts
A Accept the proposal
1, 2, 3 Keep a side
U Undo
V Cycle compare
G Show merged conflicts
M Mark reviewed
Cmd+Enter Open the push confirmation. It never pushes.

(#506)

Also in this release

  • Chat renders with Pierre Words, in a resizable panel. You can pick the model, ask about text you select in a diff, and send the whole PR as context. (#470)
  • Explanations:
    • An explanation can leave out hunks a reviewer doesn't need explained. Use the Reduce noise setting, which defaults to Conservative. (#479)
    • The hunks in each section are ordered for reading. (#477)
  • The Summary tab has a clearer type hierarchy. (#472)
  • Reviewers, assignees, labels and the milestone can be edited from Gnosis. (#440)
  • The Overview has a Starred section. (#441)
  • Moved and renamed functions are detected with tree-sitter. (#438)
  • Discovery and sync are faster, because GitHub reads are batched. (#437)

Known limits

  • The model features need the signed app.
  • Some of the checks that prove a merge are conservative. Expect more conflicts in Check than strictly needed.