Advanced Git troubleshooting