On Thu, Sep 22, 2022, 1:34 PM <djvortex@xxxxxxx> wrote > > Perhaps git could even support the "reset-to-the-remote-history and then cherry-pick your new local commits" directly, to help the developer in this task (so that you don't need to write down any hashes and do all that manually). But even if this isn't really feasible, at least detecting the situation and the clearer messages would help enormously. Are you aware of git pull --rebase ?
