I am using Github desktop.
I was working on a project on my PC, when my teammate do some changes from his PC on that project, I pull these changes, and my local chang