[DiscordArchive] A PR to filter for non-merged commits ? What's that supposed to look like ?
[DiscordArchive] A PR to filter for non-merged commits ? What's that supposed to look like ?
Original source
A PR to filter for non-merged commits ? What's that supposed to look like ?
rektbyfaith
01-22-2024, 09:46 PM #1Archived author: jackpoz • Posted: 2024-01-22T21:46:19.246000+00:00
Original source
A PR to filter for non-merged commits ? What's that supposed to look like ?
Original source
only listing and merging commits that are new to the master branch
rektbyfaith
01-22-2024, 09:47 PM #2Archived author: Northstrider • Posted: 2024-01-22T21:47:40.842000+00:00
Original source
only listing and merging commits that are new to the master branch
Original source
when you rebase the PR branch, it also squeezes the new commits, which already are within the branch
rektbyfaith
01-22-2024, 09:48 PM #3Archived author: Northstrider • Posted: 2024-01-22T21:48:18.347000+00:00
Original source
when you rebase the PR branch, it also squeezes the new commits, which already are within the branch
Original source
If you squash, new commits are created. That's why squashing sucks and merge commits are better
rektbyfaith
01-22-2024, 09:50 PM #4Archived author: jackpoz • Posted: 2024-01-22T21:50:06.309000+00:00
Original source
If you squash, new commits are created. That's why squashing sucks and merge commits are better
Original source
Squash makes the commit history look clean at the cost of making working with multiple "cascading" prs a pain
rektbyfaith
01-22-2024, 09:50 PM #5Archived author: jackpoz • Posted: 2024-01-22T21:50:53.785000+00:00
Original source
Squash makes the commit history look clean at the cost of making working with multiple "cascading" prs a pain
Original source
I always told my juniors to create branches on top of each other and I would merge (not squash)
rektbyfaith
01-22-2024, 09:51 PM #6Archived author: jackpoz • Posted: 2024-01-22T21:51:35.491000+00:00
Original source
I always told my juniors to create branches on top of each other and I would merge (not squash)
Original source
They were happy not having to wait for me to review, I was happy I could review things in order when I had time
rektbyfaith
01-22-2024, 09:52 PM #7Archived author: jackpoz • Posted: 2024-01-22T21:52:10.152000+00:00
Original source
They were happy not having to wait for me to review, I was happy I could review things in order when I had time
Original source
Squash makes good soup.
rektbyfaith
01-22-2024, 10:15 PM #8Archived author: Malcrom • Posted: 2024-01-22T22:15:14.277000+00:00
Original source
Squash makes good soup.
Original source
sometimes you need to do interactive rebase and drop duplicate commits manually
rektbyfaith
01-22-2024, 10:16 PM #9Archived author: Tea • Posted: 2024-01-22T22:16:38.522000+00:00
Original source
sometimes you need to do interactive rebase and drop duplicate commits manually
Original source
but very often git "figures it out" by itself
rektbyfaith
01-22-2024, 10:18 PM #10Archived author: Tea • Posted: 2024-01-22T22:18:21.005000+00:00
Original source
but very often git "figures it out" by itself