3 ms·
There 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
by js2 15y ago
There 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.