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.

Sign up for GitHub

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

Only include "already existing ..." comment in gitignore on conflict #7570

Merged
merged 3 commits into from
Nov 11, 2019
Merged

Only include "already existing ..." comment in gitignore on conflict #7570

merged 3 commits into from
Nov 11, 2019

Commits on Nov 7, 2019

  1. Only include "already existing ..." comment in gitignore on conflict 

    This comment was previously confusing when there were no existing items
that conflict.
    @twe4ked
    twe4ked committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    3e8cdd7 View commit details
    Browse the repository at this point in the history

  2. Fix comment

    @twe4ked
    twe4ked committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    a6db5b0 View commit details
    Browse the repository at this point in the history

  3. Improve gitignore comment wording

    @twe4ked
    twe4ked committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    c42f2ee View commit details
    Browse the repository at this point in the history