Ok, I don't get it. All the time I do a pull I get conflicts. Latest just now:
CONFLICT (delete/modify): includes/api/ApiTokens.php deleted in HEAD and modified in 4cee7f1bb6f5b40134f211a626fd70504fc216dd. Version 4cee7f1bb6f5b40134f211a626fd70504fc216dd of includes/api/ApiTokens.php left in tree. Also the IDE I use (Netbeans) shows loads of local changes I never did. Can somebody please enlighten me on how to just pull the latest HEAD version, no questions asked?! Thanks, Stephan _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
