Closed joshimoo closed 4 years ago
The squash lost the merge history so git was no longer able to figure out the which changes to apply.
I shouldn't have squashed the beta to beta pr, well I fixed it :)
Looks good
The squash lost the merge history so git was no longer able to figure out the which changes to apply.