Closed eriktrom closed 7 years ago
I tried to resolve conflicts using the UI and failed. You might need to remove the commits and rebase yourself.
I tried to resolve conflicts using the UI and failed. You might need to remove the commits and rebase yourself.