Closed goulvench closed 12 years ago
You might need to merge selectively, resolving conflicts resulted in several commits being duplicated.
Super merci !
La prochaine fois, fais plusieurs pull request (et autant de branches différentes). Ça facilite les merge par fonctionnalité.
Fusionné à la main :-) Mis en ligne !
You might need to merge selectively, resolving conflicts resulted in several commits being duplicated.