Closed joshimoo closed 4 years ago
The squash lost the merge history, so git couldn't auto merge the changes correctly.
The squash lost the merge history, so git couldn't auto merge the changes correctly.