pull request

Hi, These bugs do not happen all the time, some for a while.

1. when we doing pull request, it's overwrite the file with an older file.
2. when a developer doing checkin it's overwrite the commits Which were made in master by other developers, while at work