Programming

17333 readers

462 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

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 [email protected]

founded 1 year ago

MODERATORS

[email protected]

How common is it to code review like this? (programming.dev)

submitted 8 months ago* (last edited 8 months ago) by [email protected] to c/[email protected]

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:

Create local branch for the pr to review
Squash if necessary to get everything in the one commit
Soft reset, so all the changes are modifications in the working tree
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

[–] [email protected] 3 points 8 months ago (1 children)

I hadn't yet tried squashing + reset, that seems like a smart idea, but yeah, I don't particularly like the usual PR review UIs.

I do the merge via CLI anyways, so might as well check out the code for the review and then view it in my IDE + be able to run it and such.

[–] [email protected] 1 points 8 months ago

If you're using the CLI and cleaning up a branch for a PR, the interactive rebase is a godsend. Just run git rebase -i origin/main (or whatever your target branch is) and you can reorder/squash/reword commits.