How does git handel a situation like this.
A project managed by git and hosted on Github has a number of collaborators. Two people working on a project make changes to the same file on there local computer. Say for example they are both working on the stylesheet. And then they both commit the latest changes and send them over to Github.
Would this not cause issues, if they both changed different things within the stylesheet, only one persons work would become the lastest version, and the others would fall into the history.
I dont quite understand how this situation would be handeld to prevent new changes being lost when multiple people are working on the same file.
Can anyone explain how it works?
To complement the answer of Charlie Rudenstal: The push of the first collaborator will succeed. The push of the second collaborator will fail with the message “rejected, non-fast-forward”. Then the second collaborator fetches the last changes, merge them with his changes (maybe resolve merge conflicts) and pushes again, then it will succeed.