471

History repeats itself(lemmy.world)

posted
by
Avatar
alphacyberranger@lemmy.world
in
Avatar
programmer_humor@programming.dev
35 comments
hidereport
Sort:
HotTopControversialNewOld
You are viewing a single thread.
View all comments View context
Avatar
fiah@discuss.tchncs.de
4 points
*

for some reason it’s easier than normal rebasing though

permalink
report
parent
reply
Avatar
yogo@lemm.ee
3 points

Have you tried interactive rebase (rebase -i)? I find it very useful

permalink
report
parent
reply
Avatar
Throwaway@lemm.ee
0 points

Yeah, but then you deal with merge conflicts

permalink
report
parent
reply
Avatar
gedhrel@lemmy.ml
2 points

rerere is a lifesaver here.

(I’m also a fan of rebasing; but I also like to land commits that perform a logical and separable chunk of work, because I like history to have decent narrative flow.)

permalink
report
parent
reply
Avatar
dukk@programming.dev
2 points

You can get merge conflicts in cherry picks too, it’s the same process.

permalink
report
parent
reply

Programmer Humor

!programmer_humor@programming.dev

Create post

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

Community stats

  • 7.2K

    Monthly active users

  • 955

    Posts

  • 37K

    Comments

Community moderators