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

Jump to bottom

Fix change detection when adding files to a sketch #4849

Closed
wants to merge 2 commits into from
Closed

Fix change detection when adding files to a sketch #4849

wants to merge 2 commits into from

Commits on Jan 23, 2017

  1. Make it safe to add tab files to an open sketch. 

    Change Detector now differentiates between a merge conflict (same file
changed; will load the external changes if accepted by user; discards
editor content) or a non-conflicting change (will load the external
changes if accepted by user; nothing is lost).
    @GKFX
    GKFX committed Jan 23, 2017
    Copy the full SHA
    292c479 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2017

  1. Clarify change detector message

    @GKFX
    GKFX committed Jan 29, 2017
    Copy the full SHA
    1e14025 View commit details
    Browse the repository at this point in the history