search

wr1159 / advent

0 stars 0 forks source link

[13] User authentication #27

Closed wr1159 closed 1 year ago

wr1159 commented 1 year ago

Merge Request #17

wr1159 commented 1 year ago

Incident Report 23/05/23

What happened?

Pull Request #14 was mistakenly selected to merge as a merge commit, this disrupted our linear commit history in the main branch. To maintain software engineering practices, we should preserve a linear commit history for easier modification of history, better documentation, encouragement of smaller commits and more.

What was done?

To preserve a linear commit history in the main branch, a git reset --hard was performed at main which could have been dangerous but our use of branches and pull requests allowed us to us to reset the main branch and making another pull request which is pull request #17.