Skip to content

1.1.1

Choose a tag to compare

View all tags
@github-actions github-actions released this 21 Jul 18:07
v1.1.1
22cd5e1

A correctness fix for the merge editor. If you resolve conflicts inside GitBox, this one matters.

Fixed

The two sides of a conflict were swapped. Git writes <<<<<<< to open ours — the branch you are on — and >>>>>>> to close theirs, the branch being merged in. GitBox read them the other way round, so the merge editor labelled your local side Incoming and the branch you were merging Current.

"Accept all" acted on the wrong side. The same swap reached the bulk-resolve paths: asking for accept all incoming wrote the local side into the file, and accept all current wrote the remote one — silently, with no error. Keep both also emitted theirs before ours, against git's own ordering.

The panes themselves were always laid out correctly (left is local, right is incoming); they were being handed the wrong content. Nothing else about the merge flow changed.

If you resolved conflicts in bulk with an earlier build, it is worth reviewing those merges — the result may hold the opposite side of what you picked.

Downloads

  • Linux — AppImage, .deb, .rpm, .pacman
  • Windows — .exe (NSIS installer) or .msi

Existing installs update in place through the built-in updater.

Assets 11
Loading