09/01/2017 à 21:09 Benno Rice @jeamland
“All you need to do is type git solve problems. If that doesn’t work you do git solve problems --force”