What is a git conflict?

Related questions

1. What causes merge conflicts?
2. What's a pull request?
3. Is a pull request part of Git?
4. What is bitbucket pull request?
5. Why is a pull request called a pull request?
6. What is head in git conflict?
7. What is the purpose of a pull request?
8. What is the difference between Git and GitLab?
9. Can you delete a pull request?
10. How do I decline a pull request?

Tags

1. #files
2. #decide
3. #makes
4. #different
5. #competing
6. #happen
7. #commits
8. #computers
9. #usually
10. #which
11. #lines
12. #changes
13. #needs
14. #conflicts
15. #simple
16. #merge
17. #final
18. #branches
19. #understand
20. #incorporate