4 ms·
So what was the cause of the original error and how did you fix it?
by gms 15y ago
So what was the cause of the original error and how did you fix it?
- js2 15y agoThere was a conflict while rebasing. In this situation you generally do one of: 1. Resolve the conflict and continue rebasing. 2. Drop the conflicting change and continue rebasing. 3. Abort the rebase operation.