search

igor-krechetov / hsmcpp

C++ based Hierarchical / Finite State Machine library oriented for embedded and RTOS systems.
https://hsmcpp.readthedocs.io
MIT License
71 stars 11 forks source link

CMake changed from include(python) to find_package(python) #4

Closed yoowonsuk closed 1 year ago

yoowonsuk commented 1 year ago

Hello @igor-krechetov

I made it in unusual with a new new branch t.t Will you confirm this PR?

And I would much appreciate your letting me know how I could make your suggestion. I could have been serious about how to manage those commits. I suppose main branch of mine and yours shouldn't be modified by me since I'm not a maintainer of this repository. (don't think of upstream2 branch below, it will be confusing)

  1. I could have squash my commits in upstream branch but I was told it isn't recommended as the history will be removed at all (supposing that we are in cooperation xD)
  2. revert doesn't seem applicable to you, since more than 1 commit exists to the contrary
  3. I cannot conceive what it must be like to rebase to master(main) with one commit you mentioned although I haven't got any permissions to your main branch. still more, rebase will take all commits, now it has 8 commits.

I'm sure, you know, i don't argue with you but I want to learn HOW I should work xD THANK YOU!

igor-krechetov commented 1 year ago

Hello @yoowonsuk

Thank you, now I'll be able to merge your change.

There was nothing wrong with your approach. The issue happened because I force pushed a lot commits while debugging GitHub Actions for CI. I wasn't expecting anyone doing a PR during that time. ^^'

Normally you would just need to make sure that your main branch is in sync with the official one and rebase your dev branch before making a PR.

For merging strategy I prefer to use squash policy to keep linear git history and avoid small commits made during development or code review.

yoowonsuk commented 1 year ago

I can't thank you too much for your full explanation xD @igor-krechetov and one more thing, make sure some of your commits about deletion are not applied by this PR since I'm not sure of whether it's needed or just an accident. image