this post was submitted on 03 Jan 2024
22 points (95.8% liked)

Git

2882 readers
4 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago
MODERATORS
Ategon@programming.dev
jnovinger@programming.dev
canpolat@programming.dev
22
When do people prefer merge versus rebase? (social.jvns.ca)
submitted 10 months ago* (last edited 10 months ago) by ericjmorey@programming.dev to c/git@programming.dev
9 comments fedilink hide all child comments
 

Julia Evans (@b0rk@jvns.ca) writes:

i've been trying to figure out why some people prefer merge and some people prefer rebase. I feel like there must be some systematic reasons, like "people in situation X tend to prefer rebase, people in situation Y tend to prefer merge”

my only thought so far is that small short-lived changes work well with rebase, and longer-lived branches are maybe better to merge

(not looking for why you think rebase/merge is better here or why the people who disagree with you are wrong)

similarly, I'm trying to figure out why some folks prefer a linear commit history and some folks prefer to preserve the history as it actually happened

I feel like there are also some systematic reasons for this (like in situation X a linear history is more appropriate but in situation Y it's more appropriate to preserve what actually happened) but I haven't worked it out

for example maybe "preserve what actually happened" is more appropriate for open source projects? not sure.

you are viewing a single comment's thread
view the rest of the comments
[–] charolastra@programming.dev 14 points 10 months ago (1 children)

You just have to push through

[–] superbirra@lemmy.world 7 points 10 months ago (1 children)

but don't squash your feelings

[–] trebek@lemmy.world 6 points 10 months ago (1 children)

Pick cherries when you can

[–] noproblemmy@programming.dev 5 points 10 months ago (1 children)

Surely those cherries come from a remote origin.

[–] Ferk@kbin.social 4 points 10 months ago

Then check-out their due date, specially if they have been left out in a stack for too long, before you pop one out.