• expr@programming.dev
    0·
    7 months ago

    2 things:

    1. You don’t pull rebased work pretty much ever. Rebasing is for feature branches by a single author to craft a high quality history, generally. It’s much, much better than littering your branch with merge commits from upstream.
    2. If for some reason you do need to pull rebased changes, you simply do git pull --rebase. Works without issue.