search

kunyavskiy / polygon-cli

Command-line tool for polygon
MIT License
58 stars 17 forks source link

No differences detected #26

Open dj3500 opened 7 years ago

dj3500 commented 7 years ago

When I perform the usual workflow (init, update, modify a file, then commit), I get "Not changed" for every file (even if it is modified). This may be caused by me being on Windows (so there is no diff command, and polygon-cli diff does not work either for that reason).

kunyavskiy commented 7 years ago

Well, as see, changes should be detected,but then merge will fail (because it uses diff3). I have no good ideas how to merge files, if no merge-tool configured. Maybe, i can just try to get copy from polygon if no local changes, and put it neer with error, if both changes.

Not detected changes is strange. I don't see any difference between windows and linux here. Can you share some problem (polygon login pkunyavskiy) and describe order of actions to reproduce? (Unfortunatly, i have no windows system, to check the problem is in os difference)