Restore feature/history - Githubissues

larkinds / Spotify.MLH

3 stars 1 forks source link

Restore feature/history #24

Closed jkmartindale closed 3 years ago

jkmartindale commented 3 years ago

What happened

The feature/history branch was merged in, with some merge conflicts
Merge conflicts were accidentally resolved incorrectly
The merge was reverted
The commits on the feature/history branch couldn't be re-merged in, because they already existed in staging's history

What should've happened

Follow-up commit (and PR) to fix the merge conflicts

How this is fixed

Reverted the merge revert commit, added a commit to fix the merge conflicts