• jaemo@sh.itjust.works
    link
    fedilink
    arrow-up
    2
    ·
    9 months ago

    Here’s an example

    Say I work on authentication under feature/auth Monday and get some done. Tuesday an urgent feature request for some logging work comes in and I complete it on feature/logging and merge clean to main. To make sure all my code from Monday will work, I will then switch to feature/auth and then git pull --rebase origin main. Now my auth commits start after the merge commit from the logging pr.