search

spacetelescope / braindump

A place to collect notes from code discussions
2 stars 5 forks source link

Git: should we rebase or pull/merge? #18

Closed eteq closed 5 years ago

eteq commented 7 years ago

Discussion of when pulling/merging is better/worse than rebasing. @eteq can frame the discussion and his attitude about this.

pllim commented 7 years ago

Rebase!!! 😉 (and squash too... why not???)

sosey commented 7 years ago

interactive rebase-squash

jdavies-st commented 7 years ago

I would be happy to contribute to this discussion in a non-denominational way.

eteq commented 7 years ago

Perhaps @drdavella can tell us about git rerere (the best/worst-named git command... and that's saying something)

drdavella commented 7 years ago

I already mentioned it in #23!

drdavella commented 7 years ago

If there are multiple contributors to a PR, squashing means credit will not be given to all contributors, right?

pllim commented 7 years ago

Yes, GitHub only allows one author the last time I checked (there's "author1 committed with author2" message if you squash but I don't think they both count in the stats?). You don't have to squash all the commits, but some in a reasonable day. For example, "fix typo" or "fix doc" commits can definitely be squashed into an earlier relevant commit. There is no definite rule; it is a judgement call.

pllim commented 5 years ago

I think this is just gang war waiting to happen...