Skip to content

Conversation

@EdmondChuiHW
Copy link

@EdmondChuiHW EdmondChuiHW commented Mar 13, 2024

Summary

Didn't edit the commit message to match PR title when merging #18.
Reverted in #20.
Adding this back with proper commit message here. (and will double-check when clicking merge)

@motiz88
Copy link

motiz88 commented Mar 13, 2024

You can rebase this on #20 and merge them together.

@EdmondChuiHW
Copy link
Author

This PR is already based on #20 (base branch revert-18-meta-license).

If I understand correctly, I'll need to merge #20, delete the branch, then GitHub will automatically rebase this PR on the new base branch (main), then I can merge this PR.

Or I can merge this PR (into the base revert-18-meta-license branch), then land #20 to main (using merge not squash).

Either way should get us the desired outcome (last commit having the correct message), but I don't see a way to merge them together like "Ship Stacked" on hg/ph.

@motiz88
Copy link

motiz88 commented Mar 14, 2024

Oh I see. A PR to a branch is usually not worth doing. Let's just create PRs to main as a general rule.

@EdmondChuiHW EdmondChuiHW changed the base branch from revert-18-meta-license to main March 14, 2024 11:19
@EdmondChuiHW
Copy link
Author

EdmondChuiHW commented Mar 14, 2024

Changed base branch in this PR to point to main. It now includes commits from #20 🤯 TIL PR base branch doesn't have to match git branch's base branch

Edit: clicked "rebase and merge". The commits are merged with the local commit titles:

image

Looks like the PR number is only visible inside the commit:

image

Will probably do "create a merge commit" next time so the PR titles show up in the new commit title directly

Git blame now shows the desired info:

image

Maybe I'll just do both revert and reland in the same branch next time.

Good exercise to re-familiarise myself with git/GitHub workflows!

@EdmondChuiHW EdmondChuiHW merged commit b24377c into main Mar 14, 2024
@EdmondChuiHW EdmondChuiHW deleted the add-global-typings-to-meta-license branch March 14, 2024 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants