• merthyr1831@lemmy.world
    link
    fedilink
    arrow-up
    0
    ·
    edit-2
    7 months ago

    Heres my based af workflow:

    git checkout -b feature-branch

    rebase on top of dev whilst working locally

    git rebase origin/dev-branch && git push -f


    if i need to fix conflicts with dev-branch during a PR

    git merge origin/dev