From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Sat, 25 Apr 2026 17:24:51 GMT
Subject: Comments on Phillip's review
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