user An and B, file a, the same branch
user A first pull (time is 12:00), then edit file a, then commit and push,push time is 13:00
user B first pull (time is 12:00), then edit file a, then commit and push,push time is 13:01
in the end, does the file an in repo belong entirely to user B, or do the changes made by both users exist?
< H2 > question 2 < / H2 > user An and B, file b, the same branch
user B submitted a commit and push for modifying file b (time is 14:00)
user A started pull (time is 14:01), but found that there was an error, indicating that there was a local commit without Synchronize, so the modification commit of file b at hand was dropped, and then pull, succeeded, and then merge, finally push out
does the file b in repo contain the modification results of users An and B at this time?