The blue social bookmark and publication sharing system.
Log in with your username.
I've lost my password.
Log in with your OpenID-Provider.
So you fixed a conflict somewhere in your repo, then later stumbled on exactly the same one… Enter 'rerere', which stands for Reuse Recorded Resolution.
