Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amend repository history #9

Closed
sudotensor opened this issue Aug 5, 2021 · 1 comment
Closed

Amend repository history #9

sudotensor opened this issue Aug 5, 2021 · 1 comment
Assignees

Comments

@sudotensor
Copy link
Owner

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 946a99f; 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

@sudotensor
Copy link
Owner Author

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. ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant