Diverging branches in github codespaces

[programlich]

When I wanted to commit my solution for an assignement, it happened several times, that I ran into a conflict, because for some reason commits were created on the remote part of main while I was working. To fix it, I had to set git config pull.rebase false, then run git pull. After that I could commit and push.
Picture of the commit history after rebasing:

[sgbaird]

Oof, that's not good. Thanks for raising this. Perhaps there's a way to set this behavior by default within the codespace.

EDIT: perhaps not too feasible - https://stackoverflow.com/questions/13846300/how-to-make-git-pull-use-rebase-by-default-for-all-my-repositories

Instead, I'll probably need to try to reproduce.

[sgbaird]

It might be possible to run this as a command via the devcontainer file.