Programmer Humor

18971 readers

848 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 1 year ago

MODERATORS

[email protected]

471

History repeats itself (lemmy.world)

submitted 1 year ago by [email protected] to c/[email protected]

35 comments fedilink hide all child comments

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

[–] [email protected] 32 points 1 year ago (26 children)

OK. Query.

Rebase or merge into current?

I personally never rebase. It always seems to have some problem. I'm surely there's a place and time for rebasing but I've never seen it in action I guess.

[–] [email protected] 7 points 1 year ago (14 children)

What you do is create a third branch off master, cherry pick the commits from the feature branch, and merge in the third branch. So much easier.

[–] [email protected] 3 points 1 year ago

I’ve definitely done this before…

load more comments (13 replies)

load more comments (24 replies)