You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
While developing, one often runs the test suite locally before pushing their changes. After running the test suites, these two files are reported to be changed by git:
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: pyface/image/library/icons.zip
modified: pyface/image/library/std.zip
Then what often happens is that developers did not notice that and commit these changes as part of their PR. However these changes are orthogonal and had to be reverted (or otherwise every PR will be creating merge conflicting with other PRs). This has bitten at least 3 developers as far as I can tell.
The fix for this is possibly to not commit the zip files, but instead have the contents of the zip files in the git repo and have the zip files be generated as part of the build process?
While developing, one often runs the test suite locally before pushing their changes. After running the test suites, these two files are reported to be changed by git:
Then what often happens is that developers did not notice that and commit these changes as part of their PR. However these changes are orthogonal and had to be reverted (or otherwise every PR will be creating merge conflicting with other PRs). This has bitten at least 3 developers as far as I can tell.
See this comment: #769 (comment)
The text was updated successfully, but these errors were encountered: