2 ms·
> The solution is actually pretty easy. git rerere is the even easier solution.
by PaulDavisThe1st 3y ago
> The solution is actually pretty easy.
git rerere is the even easier solution.
- Lio 3y agoI don't know, you still end up with a dirty branch full of commits you didn't write.
- PaulDavisThe1st 3y agoI was talking about a solution to the problem you quoted: > fixing the same conflict repeatedly is annoying
- WorldMaker 3y agoI've had to force people to clear their git rerere caches as debugging the situation when that cache is FUBAR is gross.