GitHub
FreeA development platform for hosting, collaborating on, and managing software projects.
A light desktop Git client for developers working beside their IDE and coding agents.
Nori helps you review Git changes, rebase branches and open pull requests. Its conflict resolver shows your side, the incoming side and the result before you continue or abort. Nori runs on macOS, Windows and Linux beside your IDE and coding agents. The Free plan includes every Git feature and needs no account.
Updated Nov 16, 2026
No written reviews yet. Be the first to share your experience.
Tried this tool? Share your experience.
Every branch keeps its own colour wherever it appears. Drop one branch on another to merge or rebase, drop a commit to cherry-pick or revert it. Before anything runs, the menu names both branches.
Choose Squash on a fix below its parent. Nori shows the folded commit in the resulting history, alongside every reword, fixup, edit and drop in the plan.
Committed too early? Deleted the wrong branch? Before every commit, branch deletion, stash drop and discard, Nori keeps a snapshot. Undo from the toast, or pick any operation back from the list.
Your version and the incoming one side by side, the finished file underneath. Pick what stays, or ask ✦ Suggest resolution for a proposal built from both sides and their common ancestor. Nothing is applied until you choose Use this.
CI you can steer Read the job log, re-run or cancel it, start a manual job or a workflow, approve a deployment.
⌘F jumps to a branch, a file or an action. Add a filter and it searches the whole history, then narrows the graph to what matches.
File history and blame Follow a file through its renames, and open the commit behind any line. ⌘⇧H ⌘⇧B
Worktrees for your agents Every linked worktree in the sidebar, with the agent behind it: Codex, Claude Code or T3 Code, its lines changed, and how far it is ahead of its base. Click one to see what it changed, then push it.
When Git stops on a conflict, Nori names the files left to resolve and offers to open the resolver, which opens each file on its first conflict.
Nori’s resolver puts your version and the incoming one side by side, with the finished file underneath, so you choose what stays and see it before you commit.
Click a conflicted line to add or remove it from the result, use the checkbox on a conflict to take that side for the whole block, or the column header to take one side for the entire file.
Walk the conflicts from the keyboard. ⌥↑ and ⌥↓ move between conflict hunks; ⌃⌘1 and ⌃⌘2 take yours or the incoming side. On Windows and Linux they are Alt+↑, Alt+↓, Ctrl+Shift+1 and Ctrl+Shift+2.
Edit the result directly when neither side is right and the answer is a mix of both.
Mark resolved sits in the resolver’s header. On the last file of a merge the button reads Mark resolved and commit merge , because that is what it does.
$0
$20
one-time
Read the diff, then stage exactly what belongs in the commit: a hunk, one line, a run of lines. One click on ✦ writes the message from what you staged, with the agent CLI you already use.
Overview A timeline of every branch, release and contributor. Pick a lane or a span and the graph filters to it. ⌘0
Yes. The Free plan includes every Git feature, needs no account and runs on macOS, Windows and Linux.
Yes. Nori offers a 14-day trial when you choose it, giving you time to try the app.
Nori is a Git client for reviewing changes, rebasing branches and opening pull requests beside your IDE and coding agents.
Yes. It shows your side, the incoming side and the result, then lets you take a line, block or whole side before continuing or aborting.
Yes. Nori can push your branch and open a request on GitHub or GitLab, with a description drafted from your template.
Nori runs on macOS, Windows and Linux as a light desktop Git client beside your IDE and agents.
No written reviews yet. Be the first to share your experience.
Tried this tool? Share your experience.
Top rated tools from the same category.
View all Software Development tools
A development platform for hosting, collaborating on, and managing software projects.
The Collaborative Interface Design Tool that empowers teams to design, prototype, and ship products together.
The open source AI code editor that helps you code faster and smarter.
The best way to code with AI, accelerating software development through autonomous AI agents.
Build full-stack web apps and interactive prototypes effortlessly by chatting with AI.
A unified security platform that automates vulnerability detection and remediation across code, cloud, runtime, and penetration testing.