|
|
|
|
|
|
by PaulDavisThe1st
610 days ago
|
|
|
Yeah, I learned about this last weekend, after mistakenly trying to rebase a repo where we generally merge. I don't think that rerere offers fine grained enough control over "forgetting". What I needed (until I realized my mistake) was a way to clear any memory of a resolution for the current conflict in path. |
|
|