I am using Material Shell which is a tiling window manager created as an extension of GNOME Desktop Environment.
After an interactive rebase in Magit, a merge conflict happened. Thus, to fix it, I pressed
e on the problematic file.
e is bound to
Unfortunately, Emacs gets messy because
eDiff creates a new window which is not properly handled by the tilling window manager.
How to solve this mess?