Mergerie 1.4.0
Merge a branch into another, conflicts and all, without leaving the tool. A new Git → Merge
tab resolves conflicts on screen, one at a time: both versions one under the other — keep one,
keep both, or write your own. You never see a <<<<<<< marker. Then Commit and Push, each
behind its own confirmation; until you push, the destination branch has not moved.
Review runs without being asked. A merge request can be reviewed on arrival, and a report
that goes stale can be re-reviewed by itself — both capped per discovery, both off by default.
The report also publishes on the merge request, handing the review back to its author.
A branch that fell behind catches up from inside the tool. When the forge reports a conflict,
a session's project line offers Update with main: the session's commits are replayed on top of
an up-to-date starting branch, and the AI resolves what git stops on. Nothing is pushed without a
deliberate second gesture — with --force-with-lease, never a bare --force.
A follow-up picks up its own thread. Use the review report and Use the verification report
fill a follow-up with the same prompt the "fix it" button would use, so the agent continues its
session instead of rediscovering the code.
Fifty-two changes from a walk through the whole tool. A merge request card carries its size and
age, a finding is a door into the code, every statistics number opens Reviews filtered, todos tie
themselves to merge requests and tick when they merge, Jenkins jobs pin and link to repositories,
and what you typed once is remembered instead of retyped. Almost all of it reads data that was
already in the database.
Fixed. Reviewing a merge request now shows on screen (0.2 s instead of never); contrast holds
WCAG AA in both themes; a loading list says so from the first paint; the interface language applies
to the server too; a session frozen on "running" after a restart can be started again; and a local
filesystem path is a valid repository URL again.
Full changelog: https://github.com/debugall/mergerie/blob/main/CHANGELOG.md