| opendevreview | OpenStack Proposal Bot proposed openstack/openstack-manuals master: Imported Translations from Zanata https://review.opendev.org/c/openstack/openstack-manuals/+/947180 | 02:43 |
|---|---|---|
| cardoe | frickler (or anyone really): Is https://review.opendev.org/c/openstack/skyline-apiserver/+/962416 the correct way to squash to different changes into one? stable/2025.1 won't pass without both changes being combined. | 21:42 |
| fungi | cardoe: i've never seen that Includes: trailer before, i don't know that there's a necessarily "correct" wat to squash changes. i just pick the most relevant Change-Id trailer and keep that one, discarding the other, and use git's squash command in a rebase on one of the change's parents (or onto the branch tip if necessary to solve merge conflicts) | 22:06 |
| cardoe | Cause I invented it. :/ | 22:06 |
| fungi | usually in a review comment i'll mention the other change that got squashed into it, which i'll abandon (and when abandoning mention the change it was squashed into) | 22:07 |
| fungi | but yeah, mainly avoid creating extra unnecessary changes, unnecessarily rebasing the change onto a different parent (makes reviewing a little harder), and make sure to leave a trail of breadcrubms in both directions (review comments and abandon messages are sufficient but doing it in the commit message also works) | 22:12 |
| cardoe | I'm trying to do so. I just want to get the project CI working for master and the stable branches. | 22:17 |
| cardoe | I'm working on mentoring Sowmya as well. | 22:18 |
Generated by irclog2html.py 4.0.0 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!