Git tools for difficult situations - Poorvith M P