this post was submitted on 08 Mar 2024
46 points (97.9% liked)

Programming

17398 readers
86 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

founded 1 year ago
MODERATORS
snowe@programming.dev
Ategon@programming.dev
MaungaHikoi@lemmy.nz
46
How common is it to code review like this? (programming.dev)
submitted 8 months ago* (last edited 8 months ago) by slardiaardvark@programming.dev to c/programming@programming.dev
40 comments fedilink hide all child comments
 

For non-trivial reviews, when there are files with several changes, I tend to do the following in Git:

  1. Create local branch for the pr to review
  2. Squash if necessary to get everything in the one commit
  3. Soft reset, so all the changes are modifications in the working tree
  4. Go thru the modificiations "in situ" so to speak, so I get the entire context, with changes marked in the IDE, instead of just a few lines on either side.

Just curious if this is "a bit weird", or something others do as well?

(ed: as others mentioned, a squash-merge and reset, or reset back without squashing, is the same, so step 2 isn't necessary:))

you are viewing a single comment's thread
view the rest of the comments
[โ€“] Miaou@jlai.lu 2 points 8 months ago (1 children)

Sometimes the info lost is just a typo or a revert. I'd say heavily depends on the workflow of the people involved. Some like long history, some like rebasing, others, something in between. How you review those approaches changes a lot

[โ€“] amio@kbin.social 2 points 8 months ago

Sure, that's fine. I use interactive rebase for "cleaning" a lot. I'm just saying it doesn't make a difference for diffing (as you can diff any commit against any other) and doing it as a matter of routine sounds like it could skip potentially useful history.

I mostly rebase but if a branch has things happen in a sequence that matters, I would merge it instead, for example.