search

RapidScada / scada

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

VS Project File conflict #57

Closed GuoRuiLv closed 6 years ago

GuoRuiLv commented 6 years ago

image

circler3 commented 6 years ago

Encodings can be replaced by visual studio with different culture settings. Keeping the original one is OK. It won't trouble your visual studio.

FYI, please provide some description about the issue when you are going to start a issue. More information about the project can be found at the forum.

GuoRuiLv commented 6 years ago

Hi, Thanks very much. Ths VS will auto change the encoding, it will case some touble when others developer fork the project and commit code. BTW,I find that the project file(.csproj) 'encoding using utf-8 will not be changed by VS.( See Below)

image

circler3 commented 6 years ago

Hi, If you are going to contribute to the repo, please make PRs to develop branch. And make sure you are in compliance with the roadmap.

2mik commented 6 years ago

Hi, It's better to use utf-8. Using windows-1251 is legacy. @circler3 is right, don't commit to the master branch, commit to develop instead. Before development new features, we could discuss them on https://forum.rapidscada.org/ Also I plan to create a repository "scada-communitry" for commits that don't affect the core of Rapid SCADA. I can do it anytime when it's needed to somebody.

GuoRuiLv commented 6 years ago

Ok, thanks .