https://pantsbuild.org/ logo
#development
Title
# development
h

happy-kitchen-89482

05/11/2022, 1:52 AM
@witty-crayon-22786 looks like you merged to main while I was mid-release
w

witty-crayon-22786

05/11/2022, 1:52 AM
Oops... sorry. Was set to automerge.
h

happy-kitchen-89482

05/11/2022, 1:52 AM
Since it's internal maybe that's not an issue
Yeah, I think I can not worry about this, since it wouldn't change the notes?
Ah but the sequential log will be misleading, and I don't like that
h

hundreds-father-404

05/11/2022, 1:58 AM
did you already do version bump?
h

happy-kitchen-89482

05/11/2022, 1:58 AM
I merged to main
so yes
h

hundreds-father-404

05/11/2022, 1:59 AM
i think this is fine, you
git reset --hard SHA
internal commits are left off of changelog anyways
h

happy-kitchen-89482

05/11/2022, 1:59 AM
The problem is Stu's change went in before mine
I don't need to reset
h

hundreds-father-404

05/11/2022, 2:00 AM
if it's internal, I'm not seeing the issue?
w

witty-crayon-22786

05/11/2022, 2:00 AM
You can always just land a changelog edit and then actually run it. It's not tagged until you run
h

happy-kitchen-89482

05/11/2022, 2:00 AM
but I think it's fine because the code we deploy is being built in CI off main, so it will include the change
It's an internal change, so the changelog doesn't need editing
I just need to add your change to the comment on the PR
h

hundreds-father-404

05/11/2022, 2:01 AM
I just need to add your change to the comment on the PR
technically, but seems nbd
h

happy-kitchen-89482

05/11/2022, 2:01 AM
Just verifying that my thinking on that is correct
oh wait, nm
that change was in all along, I was looking at the wrong log
👍 2
Sorry for the noise
👍 1