Mairobro is used to perform the fetch and rebase tests. First, mairo's younger brother adds the file opq to the client and submits the file separately and pushes it to the server,
At this time, the server history has been updated, but the mirror branch of mairo's remote tracking has not been updated to the latest record,
Therefore, you need to update the branch in remote tracking to synchronize it with the branch on the server. Right-click the resource library and select fetch.
In this way, the branch in the local remote tracking is updated so that it is synchronized with the branch on the server.
Then mairo's brother adds the file ABC to the local private and submits it to the local warehouse.
Rebase the local mirror Branch and the mirror branch in remote tracking, check the local mirror branch, right-click and select rebase
For example, you can see that the history is in the opqabc sequence. The rebase is successful and then pushed to the server.