| 12 Sep 2023 |
 infinisil | I think the github UI allows either rebasing or merging | 10:37:29 |
 Alyssa Ross | we don't currently have merge commits everywhere | 10:37:47 |
| infinisil | (by default rebase should be good, but as Profpatsch hints at, merging sometimes makes sense) | 10:37:55 |
| Alyssa Ross | we have a combination of all kinds of merges, based on what each committer thinks is best at the time | 10:38:12 |
 @piegames:matrix.org | What would be needed here IMO is rebase + merge with trivial merge commit. | 10:38:19 |
| Alyssa Ross | yeah we definitely want merge for e.g. staging-next | 10:38:21 |
| Alyssa Ross | what would be the point of the merge commit? | 10:38:35 |
| Alyssa Ross | also, if git can figure out renames on rebasing, I think it should be able to figure them out on merging too/ | 10:38:53 |
| @piegames:matrix.org | In reply to @qyliss:fairydust.space
what would be the point of the merge commit? To associate the individual commits with the PR | 10:39:06 |
| Alyssa Ross | that's not something we do today | 10:39:19 |
| Alyssa Ross | (across the board, at least) | 10:39:31 |
