Comments on Phillip's review

From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Apr 25, 2026, 17:24 UTC
Message-ID: <20260425172451.21365-1-haraldnordgren@gmail.com>
In-Reply-To: <CALnO6CCNoo8y2V5KmE0KQ6qDurZELipFowcr=ZpZ3ocVB-uLjA@mail.gmail.com>

> When you realize this, "git pull --rebase" should help correct it.

Sure. I always run with

``` git config --global pull.rebase=true ```

I love rebasing and recomdend it to all colleagues that will listen, but it still sucks to expose yourself to a possible merge conflict when you realize you worked hours on top of a stale main branch.

> I could certainly see this being convenient.

🙌🏻

Harald

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.