This is a quick tip and command that I wanted to share with the community for some time, that helps me resolve conflicts easily in large repositories, feel free to try and adjust or suggest changes to it. Hope this helps everyone 
Gist link here.
Happy to receive feedback on this.