It\'s called a merge conflict so the first impression is that it could only happen when you run the git merge command.
git merge
Then one day, you r