A nice quality of life improvement I’d like to see in Goland’s merge conflict window is the full commit message of the rebased commit I’m trying to resolve conflicts for. It’d help for knowing which strategy I should use for picking hunks, whether to pull it from main or the feature branch.