JPDev@programming.dev to Programmer Humor@programming.dev · 9 months agoRebase Supremacyprogramming.devimagemessage-square211fedilinkarrow-up11arrow-down10
arrow-up11arrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 9 months agomessage-square211fedilink
minus-squaremerthyr1831@lemmy.worldlinkfedilinkarrow-up0·edit-29 months agoHeres 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
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