Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No differences detected #26

Open
dj3500 opened this issue Feb 5, 2017 · 1 comment
Open

No differences detected #26

dj3500 opened this issue Feb 5, 2017 · 1 comment

Comments

@dj3500
Copy link

dj3500 commented Feb 5, 2017

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
Copy link
Owner

kunyavskiy commented Feb 6, 2017

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)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants