| ▲ | NamlchakKhandro 5 hours ago |
| Who is creating a separate PR for each commit on their feature/fix branch? sounds like crazy town. I just dont understand why someone would operate like this. Lets assume you're squash merging your feature branchs to your local main, then you're raising the them as prs. why would you do this? |
|
| ▲ | verall 4 hours ago | parent | next [-] |
| On large teams I think the "cherry pick" workflow (Gerrit style) beats the "pull request" workflow (GitHub/gitlab style). On smaller teams it's the other way around. I think it's somewhere around 10-20 people actively committing that the cherry pick workflow comes out ahead. |
| |
| ▲ | danpalmer 3 hours ago | parent [-] | | This is exactly it. When I worked in a ~10 person team I just didn't get it, PRs worked quite well (with some basic discipline, they're not perfect). When I moved to a... much larger company... I don't know how PRs would work here, it would be way too unwieldy. The Gerrit style works fantastically here. |
|
|
| ▲ | steveklabnik 5 hours ago | parent | prev | next [-] |
| This is standard practice in the "stacked diffs" world: one review, one commit. |
|
| ▲ | shubhamjain an hour ago | parent | prev | next [-] |
| I haven’t used this project but I have used Gerrit. It has its drawbacks (like terrible UX) but its style of code reviews were the most sensible and commit of every PR might not be as bad as it sounds. GitHub’s PR reviews are atrocious and it’s unfortunate they have become the gold standard. In Gerrit, you commit every review, and the author has to edit individual commits to address them (using git rebase). This may sound PITA but it makes the history absolutely clean, and makes it easier for both reviewers and authors to review and address suggestions. On Github, on the other hand, reviewing a large PR is just insanely hard. Making sure comment was addressed properly is hard as well, they can get lost in a sea of suggestions. They also become separate commits instead of being part of the commit itself. The commit should always been treated as unit of work rather than the branch. |
|
| ▲ | jsphweid 5 hours ago | parent | prev | next [-] |
| 1 commit == 1 reviewable unit == 1 PR == 1 CL == 1 feature == 1 fix is a perfectly reasonable way of working. I used to work at companies where no one squashed their commits and the entire git logs were filled with 80% non-sense like "temp" or "bad" or "working" with the other 20% being coherent changes. What's the point of doing this I ask? |
| |
| ▲ | zmmmmm 26 minutes ago | parent | next [-] | | there is an inbetween .... i insist people interactively rebase those commits out. In some contexts it is actually important to have traceability of iterative proof of work towards the final result. | |
| ▲ | datsci_est_2015 4 hours ago | parent | prev | next [-] | | Well are we talking about commits pre- or post-merge? I don’t care how many commits you put into the PR / MR as long as they squash down to a single commit upon merge. | | | |
| ▲ | cobalt 4 hours ago | parent | prev [-] | | it lets you maintain version history when working, then most workflows auto squash on merge |
|
|
| ▲ | what 5 hours ago | parent | prev [-] |
| Why would you have more than one commit for a PR? That sounds like crazy town. |
| |
| ▲ | chrisweekly 4 hours ago | parent [-] | | IMHO equating commits and PRs puts undue pressure on the scope and quality of a given commit, adding potential for unnecessary stress and eliminating the benefits of an additional buffer / layer for aggregation of changes. A PR representing a sizable feature or refactor might naturally contain a dozen commits, each dedicated to a logical
area or a requisite subset of the whole. Assuming on principle a goal of keeping main in a known-good state, such intermediate and incomplete changes (fine in an unstable feature branch) would wreak havoc. It's equivalent to asking, "Why would you have more than one story in an epic (or task in a story)?". | | |
| ▲ | what 4 hours ago | parent [-] | | If your PR has more than one commit, each one should be deployable in isolation. Which means you can split your giant PR into smaller ones that can be reviewed independently. | | |
| ▲ | tclancy 3 hours ago | parent [-] | | I’ve worked under both systems, but isn’t the purity you’re describing a bit of a dodge in that you wind up force pushing amended commits when you find you forgot something? | | |
| ▲ | steveklabnik 3 hours ago | parent | next [-] | | Why is that a dodge? that's the expected way to work in this system, and it should be able to show you the interdiff between those amends. | |
| ▲ | adastra22 an hour ago | parent | prev [-] | | Not once they hit master, no. You push bug fix commits. |
|
|
|
|
