<@U06A03HV1> looks like you merged to main while I...
# development
h
@witty-crayon-22786 looks like you merged to main while I was mid-release
w
Oops... sorry. Was set to automerge.
h
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
did you already do version bump?
h
I merged to main
so yes
h
i think this is fine, you
git reset --hard SHA
internal commits are left off of changelog anyways
h
The problem is Stu's change went in before mine
I don't need to reset
h
if it's internal, I'm not seeing the issue?
w
You can always just land a changelog edit and then actually run it. It's not tagged until you run
h
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
I just need to add your change to the comment on the PR
technically, but seems nbd
h
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