Jeff Triplett on Nostr: I don't understand what GitHub is doing lately, but I find myself trying to help a ...

I don't understand what GitHub is doing lately, but I find myself trying to help a colleague once a week and getting stuck in rebase hell.

```
git checkout main
git pull origin

git checkout feature-branch
git pull feature-branch

git rebase main
... merge hell but I resolve everything...

git push origin feature-branch
# 🔥 and I have to repeat the same steps
```

Is anyone else seeing this or am I doing something wrong?

I never ran into this until the last six or seven months.