Open rksm opened 8 years ago
the update process stops and the conflicted file is left with merge markers, possibly breaking the system.
the update process stops and the conflicted file is left with merge markers, possibly breaking the system.