--- --- restore content begins
TFS has a nice feature on the local file was modified, the file on the TFS has been updated, we just click for the latest, we will do automatically merge locally.
Git find today found without this feature, when Git acquired locally modified files will not get to, but a little research can also be found in other ways to achieve this function.
Such as: the txt file, the local increase in a row, the warehouse also add a line, how to get to the latest changes in the local warehouse it?
The first step, the first stored locally modified
The second step, obtain a modified warehouse
You can see, it has been modified to get to the warehouse.
The third step in the project file at the outside, click on the pop-up store
Click Yes, you can see the file conflict
Select the file, double-click to see the difference
Select the right way to resolve conflicts
Here you can see the merged already have, and this time click Save.
Open the file, you can see it has been synchronized come. " .
OK, it is like this