Gram Re-opens source file with .orig extension after git merge #369

msrd0 commented 2026年07月09日 12:31:23 +02:00

Current Behaviour

Assume I have Gram and one file open, let's call it lib.rs.

Then assume I do weird things like going to a terminal and typing things like git fetch, git rebase origin/main, git mergetool and git rebase --continue.

When I return to Gram, I am confused because I see weird things like <<<<<<< HEAD in the open file. Then I notice the file name has changed to lib.rs.orig.

Expected Behaviour

Gram keeps the file lib.rs open and doesn't suddenly show lib.rs.orig instead.

OS

Fedora 44, Sway, Gram 3.0.1 (546708a188) from the Codeberg Packages

## Current Behaviour Assume I have Gram and one file open, let's call it `lib.rs`. Then assume I do weird things like going to a terminal and typing things like `git fetch`, `git rebase origin/main`, `git mergetool` and `git rebase --continue`. When I return to Gram, I am confused because I see weird things like `<<<<<<< HEAD` in the open file. Then I notice the file name has changed to `lib.rs.orig`. ## Expected Behaviour Gram keeps the file `lib.rs` open and doesn't suddenly show `lib.rs.orig` instead. ## OS Fedora 44, Sway, Gram 3.0.1 (546708a188438dc98863eafa85afc08ddec2bc17) from the Codeberg Packages

krig commented 2026年07月09日 15:38:30 +02:00

I suspect that what's happening is that lib.rs is being renamed to lib.rs.orig and since Gram tracks files using inotify / inodes, it considers that file to be the one it's viewing. I haven't seen this happen on Mac OS so things seem to work differently there..

I suspect that what's happening is that `lib.rs` is being renamed to `lib.rs.orig` and since Gram tracks files using inotify / inodes, it considers that file to be the one it's viewing. I haven't seen this happen on Mac OS so things seem to work differently there..