1096

Rebase Supremacy (programming.dev)

submitted 10 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev

180 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] merthyr1831@lemmy.world 10 points 10 months ago* (last edited 10 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

this post was submitted on 04 Apr 2024

1096 points (100.0% liked)

Programmer Humor

20673 readers

1092 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 2 years ago

MODERATORS