search

lambda-shuttle / mbed-os-example-ble-fota

MbedOS Example for BLE FOTA Service
Apache License 2.0
0 stars 0 forks source link

Amend repository history #9

Closed lambda-shuttle closed 3 years ago

lambda-shuttle commented 3 years ago

Development work on issues #1 and #4 saw quite a lot of commits - 67 to be exact. This is unnecessarily large considering that it only involved around six files. Also, the history saw quite a lot of fixes for accidental merges, typos, and bugs. Since the feature branches were merged, squashing commits at this point would prove unnecessarily complex.

As a result, the effective changes of the repository would need to be committed to a new branch from 946a99f9bf933bfa5463dd33fef56a7a1d5988b7; this would, in effect, make the commit history meaningful and human-readable.

Note: The main branch would have to be fixed after a pull request is issued to the upstream repository from the development branch associated with this issue.

Note to self - In the future, please make sure that before a merge to main, commits on the development branches are squashed and the CI workflow passes. Also, don't commit too frequently - this will make squashing quite hard later on.

Associated branch: github-workflow

lambda-shuttle commented 3 years ago

The associated branch has been merged and the main branch has been modified to be even with upstream. As mentioned in this pull request, the last few days have been quite the ride in understanding git discipline, and I do hope to take the mistakes as valuable lessons to learn from.

Issue resolved. ✅