• merthyr1831@lemmy.world
    link
    fedilink
    arrow-up
    10
    arrow-down
    1
    ·
    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

    • sorter_plainview@lemmy.today
      link
      fedilink
      arrow-up
      1
      ·
      7 months ago

      I have been using something very similar to this. In my team I insisted on people without any git experience working on a separate local branch, than the feature branch

      . To ensure screw ups are minimal, we pull and create a local feature branch and then a new local only dummy branch, on top of it. Once the team is more comfortable with git, I am planning to treat the local feature branch as a dummy branch.

      So far things have been pretty neat. Spaghetti is no more with minimal conflicts.