search

gazebo-tooling / action-gz-ci

MIT License
5 stars 4 forks source link

Cherry-pick #46 to jammy (try checking out ci_matching_branch for gzdev) #53

Closed scpeters closed 2 years ago

scpeters commented 2 years ago

Cherry-pick of #46 to jammy branch. Use rebase-and-merge.

scpeters commented 2 years ago

I recommended rebase-and-merge, but it's not a big deal

chapulina commented 2 years ago

Ouch sorry, fast fingers. I always assumed that squash and rebase did the same thing when there's only one commit

scpeters commented 2 years ago

rebase keeps the original commit message, while squash and merge appends an extra PR reference number, which is maybe what you want; it depends I suppose. Not a huge difference either way though

chapulina commented 2 years ago

rebase keeps the original commit message, while squash and merge appends an extra PR reference number, which is maybe what you want; it depends I suppose. Not a huge difference either way though

Ahh makes sense 👍🏽 Thanks for the clarification.