| Time |
Nick |
Message |
| 04:00 |
|
MTDiscord joined #luanti-dev |
| 11:45 |
|
turtleman joined #luanti-dev |
| 18:05 |
|
ivanbu joined #luanti-dev |
| 18:23 |
|
Niklp2 joined #luanti-dev |
| 18:23 |
|
Juri joined #luanti-dev |
| 19:12 |
MTDiscord |
<luatic> what's our policy for fixup commits |
| 19:13 |
sfan5 |
what do you mean |
| 19:13 |
MTDiscord |
<luatic> sometimes i'll make a PR with a series of commits and then in reponse to reviews i'll add fixup commits |
| 19:13 |
MTDiscord |
<luatic> i can of course mark PRs with fixup commits as [manual merge], or i can autosquash after making a couple and make it [no squash], but that might make it harder to track which changes were made in response to reviews |
| 19:14 |
MTDiscord |
<luatic> if i mark as [no squash] but don't squash it's possible that someone merges by rebasing and then the fixup commits aren't squashed away as they should be |
| 19:15 |
MTDiscord |
<luatic> sadly github doesn't autosquash during rebase |
| 19:19 |
sfan5 |
I keep my PRs in mergeable state (unless they're wip) |
| 19:20 |
sfan5 |
so apply fixups immediately |
| 19:22 |
MTDiscord |
<luatic> ok |
| 19:40 |
Krock |
[manual squash] if it needs your interaction |
| 21:41 |
|
YuGiOhJCJ joined #luanti-dev |
| 22:33 |
|
panwolfram joined #luanti-dev |
