I changed a file, realized that this should not go into the next commit, stashed it, committed my changes, brought back the stashed file and then pulled changes from Github.
That caused a conflict in that file. Link printed a warning to the session:
Link Warning: ⎕SE.Link.Notify: changed C:....somestuff.apla: invalid file contents
This is caused by the conflict markers injected into the file by Git.
The question is: shouldn't Link throw an error rather than issue a warning?
I was not sure about this, but then I learned that Link's Import would throw an error on such a file, and I guess the two scenarios should be handled consistently.
I changed a file, realized that this should not go into the next commit, stashed it, committed my changes, brought back the stashed file and then pulled changes from Github.
That caused a conflict in that file. Link printed a warning to the session:
This is caused by the conflict markers injected into the file by Git.
The question is: shouldn't Link throw an error rather than issue a warning?
I was not sure about this, but then I learned that Link's Import would throw an error on such a file, and I guess the two scenarios should be handled consistently.