search

RapidScada / scada

Contains Rapid SCADA sources
Apache License 2.0
680 stars 311 forks source link

The project files(.sln .csproj) should in git control? #54

Closed GuoRuiLv closed 6 years ago

GuoRuiLv commented 6 years ago

I fork the project, there generated some new file and the Solution file (.sln) and Project file(csproj) also changed when i open the project with vs2017. It wil cause merge conflict . How can i avoid the problem? Blow is the screencapture. image

circler3 commented 6 years ago

I think you have moved the solution file location of log.sln. If you keep the original folder structure, it won't show confict.

GuoRuiLv commented 6 years ago

Yes,you are right. It cased by some operate by me. Now it is correct.

GuoRuiLv commented 6 years ago

Thanks very much.