git - GitHub 2 People commit changes to same branch

Question

(This question already has answers here): question from:https://stackoverflow.com/questions/66050943/github-2-people-commit-changes-to-same-branch

Answer 1

To a large extent, the pull request part of the story is irrlevant; we are really just talking about merging.

If two people work on the same file, their code might merge and it might not. Git thinks in terms of lines — which actually turns out to mean a line and its immediate neighborhood. In a 20-line file, if Alice edits line 1 and Bob edits line 20, that is mergeable without a conflict. If they both edit line 1, it isn't.